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

Merge branch 'fix_garbled_fonts_macos' into 3.0

Browse source
This commit is contained in:
ChrisTerBeke 2017-10-04 14:09:59 +02:00
commit b62c19206f
17 changed files with 99 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

24
resources/definitions/fdmprinter.def.json
View file

@ -1405,6 +1405,28 @@
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
"infill_offset_x":
{
"label": "Infill X Offset",
"description": "The infill pattern is offset this distance along the X axis.",
"unit": "mm",
"type": "float",
"default_value": 0,
"enabled": "infill_pattern == 'grid' or infill_pattern == 'lines' or infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'zigzag'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
"infill_offset_y":
{
"label": "Infill Y Offset",
"description": "The infill pattern is offset this distance along the Y axis.",
"unit": "mm",
"type": "float",
"default_value": 0,
"enabled": "infill_pattern == 'grid' or infill_pattern == 'lines' or infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'zigzag'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
"sub_div_rad_add":
{
"label": "Cubic Subdivision Shell",
@ -3986,7 +4008,7 @@
"skirt_gap":
{
"label": "Skirt Distance",
"description": "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance, multiple skirt lines will extend outwards from this distance.",
"description": "The horizontal distance between the skirt and the first layer of the print.\nThis is the minimum distance. Multiple skirt lines will extend outwards from this distance.",
"unit": "mm",
"type": "float",
"default_value": 3,

2
resources/qml/SaveButton.qml
View file

@ -43,7 +43,7 @@ Item {
}
}
Text {
Label {
id: statusLabel
width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width
anchors.top: parent.top

8
resources/qml/Sidebar.qml
View file

@ -114,7 +114,7 @@ Rectangle
}
}
Text {
Label {
id: settingsModeLabel
text: !hideSettings ? catalog.i18nc("@label:listbox", "Print Setup") : catalog.i18nc("@label:listbox","Print Setup disabled\nG-code files cannot be modified");
anchors.left: parent.left
@ -324,7 +324,7 @@ Rectangle
anchors.bottom: timeSpecDescription.top
font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text_subtext")
text: (!base.printDuration || !base.printDuration.valid) ? catalog.i18nc("@label", "00h 00min") : base.printDuration.getDisplayString(UM.DurationFormat.Short)
text: (!base.printDuration || !base.printDuration.valid) ? catalog.i18nc("@label Hours and minutes", "00h 00min") : base.printDuration.getDisplayString(UM.DurationFormat.Short)
MouseArea
{
@ -407,12 +407,12 @@ Rectangle
}
if(someCostsKnown)
{
return catalog.i18nc("@label", "%1m / ~ %2g / ~ %4 %3").arg(lengths.join(" + "))
return catalog.i18nc("@label Print estimates: m for meters, g for grams, %4 is currency and %3 is print cost", "%1m / ~ %2g / ~ %4 %3").arg(lengths.join(" + "))
.arg(weights.join(" + ")).arg(costs.join(" + ")).arg(UM.Preferences.getValue("cura/currency"));
}
else
{
return catalog.i18nc("@label", "%1m / ~ %2g").arg(lengths.join(" + ")).arg(weights.join(" + "));
return catalog.i18nc("@label Print estimates: m for meters, g for grams", "%1m / ~ %2g").arg(lengths.join(" + ")).arg(weights.join(" + "));
}
}
}

2
resources/qml/SidebarHeader.qml
View file

@ -363,7 +363,7 @@ Column
visible: !Cura.MachineManager.isCurrentSetupSupported
}
Text {
Label {
id: materialInfoLabel
wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "<a href='%1'>Check material compatibility</a>")

40
resources/qml/SidebarSimple.qml
View file

@ -154,7 +154,7 @@ Item
}
}
Text
Label
{
id: qualityRowTitle
text: catalog.i18nc("@label", "Layer Height")
@ -171,11 +171,11 @@ Item
{
model: qualityModel
Text
Label
{
anchors.verticalCenter: parent.verticalCenter
anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height / 2
anchors.topMargin: parseInt(UM.Theme.getSize("sidebar_margin").height / 2)
color: (Cura.MachineManager.activeMachine != null && Cura.ProfilesModel.getItem(index).available) ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
text:
{
@ -194,13 +194,13 @@ Item
// Make sure the text aligns correctly with each tick
if (qualityModel.totalTicks == 0) {
// If there is only one tick, align it centrally
return ((base.width * 0.55) - width) / 2
return parseInt(((base.width * 0.55) - width) / 2)
} else if (index == 0) {
return (base.width * 0.55 / qualityModel.totalTicks) * index
} else if (index == qualityModel.totalTicks) {
return (base.width * 0.55 / qualityModel.totalTicks) * index - width
} else {
return (base.width * 0.55 / qualityModel.totalTicks) * index - (width / 2)
return parseInt((base.width * 0.55 / qualityModel.totalTicks) * index - (width / 2))
}
}
}
@ -310,7 +310,7 @@ Item
}
}
Text
Label
{
id: speedLabel
anchors.top: speedSlider.bottom
@ -322,7 +322,7 @@ Item
color: UM.Theme.getColor("text")
}
Text
Label
{
anchors.bottom: speedLabel.bottom
anchors.left: speedSlider.left
@ -333,7 +333,7 @@ Item
horizontalAlignment: Text.AlignLeft
}
Text
Label
{
anchors.bottom: speedLabel.bottom
anchors.right: speedSlider.right
@ -360,7 +360,7 @@ Item
width: UM.Theme.getSize("sidebar").width * .45 - UM.Theme.getSize("sidebar_margin").width
Text
Label
{
id: infillLabel
text: catalog.i18nc("@label", "Infill")
@ -385,7 +385,7 @@ Item
anchors.top: infillCellLeft.top
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
Text {
Label {
id: selectedInfillRateText
//anchors.top: parent.top
@ -482,7 +482,7 @@ Item
anchors.right: parent.right
anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height / 2
anchors.topMargin: parseInt(UM.Theme.getSize("sidebar_margin").height / 2)
// we loop over all density icons and only show the one that has the current density and steps
Repeater
@ -533,7 +533,7 @@ Item
property alias _hovered: enableGradualInfillMouseArea.containsMouse
anchors.top: infillSlider.bottom
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height / 2 // closer to slider since it belongs to the same category
anchors.topMargin: parseInt(UM.Theme.getSize("sidebar_margin").height / 2) // closer to slider since it belongs to the same category
anchors.left: infillCellRight.left
style: UM.Theme.styles.checkbox
@ -563,10 +563,10 @@ Item
}
}
Text {
Label {
id: gradualInfillLabel
anchors.left: enableGradualInfillCheckBox.right
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width / 2
anchors.leftMargin: parseInt(UM.Theme.getSize("sidebar_margin").width / 2)
text: catalog.i18nc("@label", "Enable gradual")
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
@ -621,13 +621,13 @@ Item
//
// Enable support
//
Text
Label
{
id: enableSupportLabel
visible: enableSupportCheckBox.visible
anchors.top: infillCellRight.bottom
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height * 1.5
anchors.topMargin: parseInt(UM.Theme.getSize("sidebar_margin").height * 1.5)
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
anchors.verticalCenter: enableSupportCheckBox.verticalCenter
@ -674,7 +674,7 @@ Item
}
}
Text
Label
{
id: supportExtruderLabel
visible: supportExtruderCombobox.visible
@ -750,7 +750,7 @@ Item
}
Text
Label
{
id: adhesionHelperLabel
visible: adhesionCheckBox.visible
@ -836,12 +836,12 @@ Item
{
id: tipsCell
anchors.top: adhesionCheckBox.visible ? adhesionCheckBox.bottom : (enableSupportCheckBox.visible ? supportExtruderCombobox.bottom : infillCellRight.bottom)
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height * 2
anchors.topMargin: parseInt(UM.Theme.getSize("sidebar_margin").height * 2)
anchors.left: parent.left
width: parent.width
height: tipsText.contentHeight * tipsText.lineCount
Text
Label
{
id: tipsText
anchors.left: parent.left

2
resources/qml/SidebarTooltip.qml
View file

@ -43,7 +43,7 @@ UM.PointingRectangle {
base.opacity = 0;
}
Text {
Label {
id: label;
anchors {
top: parent.top;

4
resources/themes/cura-light/theme.json
View file

@ -17,10 +17,6 @@
"size": 1.15,
"family": "Open Sans"
},
"default_little_big": {
"size": 1.17,
"family": "Open Sans"
},
"default_bold": {
"size": 1.15,
"bold": true,