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

Merge branch 'fix_system_text_rendering' of https://github.com/fieldOfView/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2017-07-26 16:49:28 +02:00
commit 021425ee06
15 changed files with 92 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/qml/AboutDialog.qml
View file

@ -22,15 +22,15 @@ UM.Dialog
Image
{
id: logo
width: base.minimumWidth * 0.85
height: width * (1/4.25)
width: (base.minimumWidth * 0.85) | 0
height: (width * (1/4.25)) | 0
source: UM.Theme.getImage("logo")
sourceSize.width: width
sourceSize.height: height
anchors.top: parent.top
anchors.topMargin: (base.minimumWidth - width) / 2
anchors.topMargin: ((base.minimumWidth - width) / 2) | 0
anchors.horizontalCenter: parent.horizontalCenter
UM.I18nCatalog{id: catalog; name:"cura"}
@ -44,7 +44,7 @@ UM.Dialog
font: UM.Theme.getFont("large")
anchors.right : logo.right
anchors.top: logo.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height / 2
anchors.topMargin: (UM.Theme.getSize("default_margin").height / 2) | 0
}
Label

6
resources/qml/DiscardOrKeepProfileChangesDialog.qml
View file

@ -109,20 +109,20 @@ UM.Dialog
role: "label"
title: catalog.i18nc("@title:column", "Profile settings")
delegate: labelDelegate
width: tableView.width * 0.4
width: (tableView.width * 0.4) | 0
}
TableViewColumn
{
role: "original_value"
title: catalog.i18nc("@title:column", "Default")
width: tableView.width * 0.3
width: (tableView.width * 0.3) | 0
delegate: defaultDelegate
}
TableViewColumn
{
role: "user_value"
title: catalog.i18nc("@title:column", "Customized")
width: tableView.width * 0.3 - 1
width: (tableView.width * 0.3) | 0
}
section.property: "category"
section.delegate: Label

2
resources/qml/OpenFilesIncludingProjectsDialog.qml
View file

@ -59,7 +59,7 @@ UM.Dialog
anchors.right: parent.right
spacing: 10
Text
Label
{
text: catalog.i18nc("@text:window", "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?")
anchors.left: parent.left

16
resources/qml/Preferences/MachinesPage.qml
View file

@ -66,7 +66,7 @@ UM.ManagementPage
visible: base.currentItem != null
anchors.fill: parent
Text
Label
{
id: machineName
text: base.currentItem && base.currentItem.name ? base.currentItem.name : ""
@ -146,34 +146,34 @@ UM.ManagementPage
property var connectedPrinter: printerConnected ? Cura.MachineManager.printerOutputDevices[0] : null
property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
Text
Label
{
text: catalog.i18nc("@label", "Printer type:")
visible: base.currentItem && "definition_name" in base.currentItem.metadata
}
Text
Label
{
text: (base.currentItem && "definition_name" in base.currentItem.metadata) ? base.currentItem.metadata.definition_name : ""
}
Text
Label
{
text: catalog.i18nc("@label", "Connection:")
visible: base.currentItem && base.currentItem.id == Cura.MachineManager.activeMachineId
}
Text
Label
{
width: parent.width * 0.7
width: (parent.width * 0.7) | 0
text: machineInfo.printerConnected ? machineInfo.connectedPrinter.connectionText : catalog.i18nc("@info:status", "The printer is not connected.")
visible: base.currentItem && base.currentItem.id == Cura.MachineManager.activeMachineId
wrapMode: Text.WordWrap
}
Text
Label
{
text: catalog.i18nc("@label", "State:")
visible: base.currentItem && base.currentItem.id == Cura.MachineManager.activeMachineId && machineInfo.printerAcceptsCommands
}
Label {
width: parent.width * 0.7
width: (parent.width * 0.7) | 0
text:
{
if(!machineInfo.printerConnected || !machineInfo.printerAcceptsCommands) {

10
resources/qml/Preferences/MaterialView.qml
View file

@ -16,8 +16,8 @@ TabView
property bool editingEnabled: false;
property string currency: UM.Preferences.getValue("cura/currency") ? UM.Preferences.getValue("cura/currency") : "€"
property real firstColumnWidth: width * 0.45
property real secondColumnWidth: width * 0.45
property real firstColumnWidth: (width * 0.45) | 0
property real secondColumnWidth: (width * 0.45) | 0
property string containerId: ""
property var materialPreferenceValues: UM.Preferences.getValue("cura/material_settings") ? JSON.parse(UM.Preferences.getValue("cura/material_settings")) : {}
@ -53,7 +53,7 @@ TabView
flickableItem.flickableDirection: Flickable.VerticalFlick
frameVisible: true
property real columnWidth: Math.floor(viewport.width * 0.5) - UM.Theme.getSize("default_margin").width
property real columnWidth: (viewport.width * 0.5 - UM.Theme.getSize("default_margin").width) | 0
Flow
{
@ -115,8 +115,8 @@ TabView
id: colorSelector
color: properties.color_code
width: colorLabel.height * 0.75
height: colorLabel.height * 0.75
width: (colorLabel.height * 0.75) | 0
height: (colorLabel.height * 0.75) | 0
border.width: UM.Theme.getSize("default_lining").height
anchors.verticalCenter: parent.verticalCenter

14
resources/qml/Preferences/MaterialsPage.qml
View file

@ -53,21 +53,21 @@ UM.ManagementPage
Row
{
spacing: UM.Theme.getSize("default_margin").width / 2;
anchors.left: parent.left;
anchors.leftMargin: UM.Theme.getSize("default_margin").width;
anchors.right: parent.right;
spacing: (UM.Theme.getSize("default_margin").width / 2) | 0
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.right: parent.right
Rectangle
{
width: parent.height * 0.8
height: parent.height * 0.8
width: (parent.height * 0.8) | 0
height: (parent.height * 0.8) | 0
color: model.metadata.color_code
border.color: isCurrentItem ? palette.highlightedText : palette.text;
anchors.verticalCenter: parent.verticalCenter
}
Label
{
width: parent.width * 0.3
width: (parent.width * 0.3) | 0
text: model.metadata.material
elide: Text.ElideRight
font.italic: model.id == activeId

8
resources/qml/Preferences/ProfileTab.qml
View file

@ -51,14 +51,14 @@ Tab
{
role: "label"
title: catalog.i18nc("@title:column", "Setting")
width: parent.width * 0.4
width: (parent.width * 0.4) | 0
delegate: itemDelegate
}
TableViewColumn
{
role: "profile_value"
title: catalog.i18nc("@title:column", "Profile")
width: parent.width * 0.18
width: (parent.width * 0.18) | 0
delegate: itemDelegate
}
TableViewColumn
@ -66,14 +66,14 @@ Tab
role: "user_value"
title: catalog.i18nc("@title:column", "Current");
visible: quality == Cura.MachineManager.globalQualityId
width: parent.width * 0.18
width: (parent.width * 0.18) | 0
delegate: itemDelegate
}
TableViewColumn
{
role: "unit"
title: catalog.i18nc("@title:column", "Unit")
width: parent.width * 0.14
width: (parent.width * 0.14) | 0
delegate: itemDelegate
}

24
resources/qml/WorkspaceSummaryDialog.qml
View file

@ -95,12 +95,12 @@ UM.Dialog
Label
{
text: catalog.i18nc("@action:label", "Type")
width: parent.width / 3
width: (parent.width / 3) | 0
}
Label
{
text: Cura.MachineManager.activeDefinitionName
width: parent.width / 3
width: (parent.width / 3) | 0
}
}
Row
@ -110,12 +110,12 @@ UM.Dialog
Label
{
text: catalog.i18nc("@action:label", "Name")
width: parent.width / 3
width: (parent.width / 3) | 0
}
Label
{
text: Cura.MachineManager.activeMachineName
width: parent.width / 3
width: (parent.width / 3) | 0
}
}
@ -142,12 +142,12 @@ UM.Dialog
Label
{
text: catalog.i18nc("@action:label", "%1 & material").arg(Cura.MachineManager.activeDefinitionVariantsName)
width: parent.width / 3
width: (parent.width / 3) | 0
}
Label
{
text: Cura.MachineManager.activeVariantNames[index] + ", " + modelData
width: parent.width / 3
width: (parent.width / 3) | 0
}
}
}
@ -170,12 +170,12 @@ UM.Dialog
Label
{
text: catalog.i18nc("@action:label", "Not in profile")
width: parent.width / 3
width: (parent.width / 3) | 0
}
Label
{
text: catalog.i18ncp("@action:label", "%1 override", "%1 overrides", Cura.MachineManager.numUserSettings).arg(Cura.MachineManager.numUserSettings)
width: parent.width / 3
width: (parent.width / 3) | 0
}
visible: Cura.MachineManager.numUserSettings
}
@ -186,12 +186,12 @@ UM.Dialog
Label
{
text: catalog.i18nc("@action:label", "Name")
width: parent.width / 3
width: (parent.width / 3) | 0
}
Label
{
text: Cura.MachineManager.activeQualityName
width: parent.width / 3
width: (parent.width / 3) | 0
}
}
@ -214,12 +214,12 @@ UM.Dialog
Label
{
text: catalog.i18nc("@action:label", "Visible settings:")
width: parent.width / 3
width: (parent.width / 3) | 0
}
Label
{
text: catalog.i18nc("@action:label", "%1 out of %2" ).arg(definitionsModel.visibleCount).arg(Cura.MachineManager.totalNumberOfSettings)
width: parent.width / 3
width: (parent.width / 3) | 0
}
}