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

Merge pull request #2691 from Ultimaker/cleaner_open_project_dialog

Browse source 
Cleaner open project dialog & redering on partial pixels fixes
This commit is contained in:
alekseisasin 2017-10-31 09:58:52 +01:00 • committed by GitHub
commit 055b6ebaab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 40 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/LayerView/LayerSliderLabel.qml
View file

@ -48,7 +48,7 @@ UM.PointingRectangle {
anchors {
left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width / 2
leftMargin: Math.floor(UM.Theme.getSize("default_margin").width / 2)
verticalCenter: parent.verticalCenter
}
@ -90,7 +90,7 @@ UM.PointingRectangle {
anchors {
left: parent.right
leftMargin: UM.Theme.getSize("default_margin").width / 2
leftMargin: Math.floor(UM.Theme.getSize("default_margin").width / 2)
verticalCenter: parent.verticalCenter
}

3
plugins/UM3NetworkPrinting/ClusterControlItem.qml
View file

@ -83,8 +83,7 @@ Component
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width
//TODO; It's probably nicer to do this with a dynamic data model instead of hardcoding this.
//But you know the drill; time constraints don't result in elegant code.
Item
{
width: parent.width

18
plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
View file

@ -114,7 +114,7 @@ Cura.MachineAction
Column
{
width: (parent.width * 0.5) | 0
width: Math.floor(parent.width * 0.5)
spacing: UM.Theme.getSize("default_margin").height
ScrollView
@ -191,8 +191,6 @@ Cura.MachineAction
anchors.left: parent.left
anchors.right: parent.right
wrapMode: Text.WordWrap
//: Tips label
//TODO: get actual link from webteam
text: catalog.i18nc("@label", "If your printer is not listed, read the <a href='%1'>network printing troubleshooting guide</a>").arg("https://ultimaker.com/en/troubleshooting");
onLinkActivated: Qt.openUrlExternally(link)
}
@ -200,7 +198,7 @@ Cura.MachineAction
}
Column
{
width: (parent.width * 0.5) | 0
width: Math.floor(parent.width * 0.5)
visible: base.selectedPrinter ? true : false
spacing: UM.Theme.getSize("default_margin").height
Label
@ -218,13 +216,13 @@ Cura.MachineAction
columns: 2
Label
{
width: (parent.width * 0.5) | 0
width: Math.floor(parent.width * 0.5)
wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "Type")
}
Label
{
width: (parent.width * 0.5) | 0
width: Math.floor(parent.width * 0.5)
wrapMode: Text.WordWrap
text:
{
@ -249,25 +247,25 @@ Cura.MachineAction
}
Label
{
width: (parent.width * 0.5) | 0
width: Math.floor(parent.width * 0.5)
wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "Firmware version")
}
Label
{
width: (parent.width * 0.5) | 0
width: Math.floor(parent.width * 0.5)
wrapMode: Text.WordWrap
text: base.selectedPrinter ? base.selectedPrinter.firmwareVersion : ""
}
Label
{
width: (parent.width * 0.5) | 0
width: Math.floor(parent.width * 0.5)
wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "Address")
}
Label
{
width: (parent.width * 0.5) | 0
width: Math.floor(parent.width * 0.5)
wrapMode: Text.WordWrap
text: base.selectedPrinter ? base.selectedPrinter.ipAddress : ""
}

8
plugins/UM3NetworkPrinting/MonitorItem.qml
View file

@ -17,10 +17,10 @@ Component
}
return (sourceSize.width / sourceSize.height) > (maximumWidth / maximumHeight);
}
property real _width: Math.min(maximumWidth, sourceSize.width)
property real _height: Math.min(maximumHeight, sourceSize.height)
width: proportionalHeight ? _width : sourceSize.width * _height / sourceSize.height
height: !proportionalHeight ? _height : sourceSize.height * _width / sourceSize.width
property real _width: Math.floor(Math.min(maximumWidth, sourceSize.width))
property real _height: Math.floor(Math.min(maximumHeight, sourceSize.height))
width: proportionalHeight ? _width : Math.floor(sourceSize.width * _height / sourceSize.height)
height: !proportionalHeight ? _height : Math.floor(sourceSize.height * _width / sourceSize.width)
anchors.horizontalCenter: parent.horizontalCenter
onVisibleChanged:

2
plugins/UM3NetworkPrinting/PrintCoreConfiguration.qml
View file

@ -10,7 +10,7 @@ Item
id: extruderInfo
property var printCoreConfiguration
width: parent.width / 2
width: Math.floor(parent.width / 2)
height: childrenRect.height
Label
{

12
plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
View file

@ -86,7 +86,7 @@ Rectangle
Rectangle
{
width: parent.width / 3
width: Math.floor(parent.width / 3)
height: parent.height
Label // Print job name
@ -131,7 +131,7 @@ Rectangle
Rectangle
{
width: parent.width / 3 * 2
width: Math.floor(parent.width / 3 * 2)
height: parent.height
Label // Friendly machine name
@ -139,7 +139,7 @@ Rectangle
id: printerNameLabel
anchors.top: parent.top
anchors.left: parent.left
width: parent.width / 2 - UM.Theme.getSize("default_margin").width - showCameraIcon.width
width: Math.floor(parent.width / 2 - UM.Theme.getSize("default_margin").width - showCameraIcon.width)
text: printer.friendly_name
font: UM.Theme.getFont("default_bold")
elide: Text.ElideRight
@ -149,7 +149,7 @@ Rectangle
{
id: printerTypeLabel
anchors.top: printerNameLabel.bottom
width: parent.width / 2 - UM.Theme.getSize("default_margin").width
width: Math.floor(parent.width / 2 - UM.Theme.getSize("default_margin").width)
text: printer.machine_variant
anchors.left: parent.left
elide: Text.ElideRight
@ -183,7 +183,7 @@ Rectangle
id: extruderInfo
anchors.bottom: parent.bottom
width: parent.width / 2 - UM.Theme.getSize("default_margin").width
width: Math.floor(parent.width / 2 - UM.Theme.getSize("default_margin").width)
height: childrenRect.height
spacing: UM.Theme.getSize("default_margin").width
@ -217,7 +217,7 @@ Rectangle
anchors.right: parent.right
anchors.top: parent.top
height: showExtended ? parent.height: printProgressTitleBar.height
width: parent.width / 2 - UM.Theme.getSize("default_margin").width
width: Math.floor(parent.width / 2 - UM.Theme.getSize("default_margin").width)
border.width: UM.Theme.getSize("default_lining").width
border.color: lineColor
radius: cornerRadius

2
plugins/UM3NetworkPrinting/PrinterVideoStream.qml
View file

@ -57,7 +57,7 @@ Item
{
id: cameraImage
width: Math.min(sourceSize.width === 0 ? 800 * screenScaleFactor : sourceSize.width, maximumWidth)
height: (sourceSize.height === 0 ? 600 * screenScaleFactor : sourceSize.height) * width / sourceSize.width
height: Math.floor((sourceSize.height === 0 ? 600 * screenScaleFactor : sourceSize.height) * width / sourceSize.width)
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
z: 1