GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-12 00:09:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Codestyle fixes

Browse Source 
CL-524
This commit is contained in:
Jaime van Kessel 2017-10-06 13:37:48 +02:00
parent 21ad2548b7
commit af0615f985
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
View File

@ -4,7 +4,6 @@ import QtQuick.Controls.Styles 1.4
import UM 1.3 as UM import UM 1.3 as UM
Rectangle Rectangle
{ {
function strPadLeft(string, pad, length) function strPadLeft(string, pad, length)
@ -164,13 +163,14 @@ Rectangle
} }
} }
Row // PrintCode config Row // PrintCore config
{ {
id: extruderInfo id: extruderInfo
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
width: parent.width / 2 - UM.Theme.getSize("default_margin").width width: parent.width / 2 - UM.Theme.getSize("default_margin").width
height: childrenRect.height height: childrenRect.height
spacing: 10 * screenScaleFactor spacing: 10 * screenScaleFactor
PrintCoreConfiguration PrintCoreConfiguration
@ -207,40 +207,37 @@ Rectangle
border.color: lineColor border.color: lineColor
radius: cornerRadius radius: cornerRadius
property var showExtended: { property var showExtended: {
if(printJob!= null) if(printJob != null)
{ {
var extendStates = ["sent_to_printer", "wait_for_configuration", "printing", "pre_print", "post_print", "wait_cleanup", "queued"]; var extendStates = ["sent_to_printer", "wait_for_configuration", "printing", "pre_print", "post_print", "wait_cleanup", "queued"];
return extendStates.indexOf(printJob.status) !== -1; return extendStates.indexOf(printJob.status) !== -1;
} }
return ! printer.enabled; return !printer.enabled;
}
visible:
{
return true
} }
Item // Status and Percent Item // Status and Percent
{ {
id: printProgressTitleBar id: printProgressTitleBar
width: parent.width
//border.width: UM.Theme.getSize("default_lining").width
//border.color: lineColor
height: 40 * screenScaleFactor
anchors.left: parent.left
property var showPercent: { property var showPercent: {
return printJob != null && (["printing", "post_print", "pre_print", "sent_to_printer"].indexOf(printJob.status) !== -1); return printJob != null && (["printing", "post_print", "pre_print", "sent_to_printer"].indexOf(printJob.status) !== -1);
} }
width: parent.width
//TODO: hardcoded value
height: 40 * screenScaleFactor
anchors.left: parent.left
Label Label
{ {
id: statusText id: statusText
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: parent.verticalCenter
anchors.right: progressText.left anchors.right: progressText.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: parent.verticalCenter
text: { text: {
if ( ! printer.enabled) if (!printer.enabled)
{ {
return catalog.i18nc("@label:status", "Disabled"); return catalog.i18nc("@label:status", "Disabled");
} }
@ -283,7 +280,6 @@ Rectangle
} }
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("small") font: UM.Theme.getFont("small")
} }
@ -292,11 +288,11 @@ Rectangle
id: progressText id: progressText
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.top: statusText.top anchors.top: statusText.top
text: formatPrintJobPercent(printJob) text: formatPrintJobPercent(printJob)
visible: printProgressTitleBar.showPercent visible: printProgressTitleBar.showPercent
//TODO: Hardcoded value
opacity: 0.65 opacity: 0.65
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("very_small")
} }
@ -309,10 +305,10 @@ Rectangle
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.top: statusText.top anchors.top: statusText.top
visible: ! printProgressTitleBar.showPercent visible: !printProgressTitleBar.showPercent
source: { source: {
if ( ! printer.enabled) if (!printer.enabled)
{ {
return "blocked-icon.svg"; return "blocked-icon.svg";
} }
@ -362,7 +358,7 @@ Rectangle
{ {
text: text:
{ {
if ( ! printer.enabled) if (!printer.enabled)
{ {
return catalog.i18nc("@label", "Not accepting print jobs"); return catalog.i18nc("@label", "Not accepting print jobs");
} }