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

Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0"

Browse source 
This reverts commit b62c19206f, reversing
changes made to 104926c6ed.

Contributes to issue CURA-4414.
This commit is contained in:
Ghostkeeper 2017-10-05 10:28:54 +02:00
parent 30be02be14
commit e07e7bc9e7
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
17 changed files with 41 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

40
resources/qml/SidebarSimple.qml
View file

@ -154,7 +154,7 @@ Item
}
}
Label
Text
{
id: qualityRowTitle
text: catalog.i18nc("@label", "Layer Height")
@ -171,11 +171,11 @@ Item
{
model: qualityModel
Label
Text
{
anchors.verticalCenter: parent.verticalCenter
anchors.top: parent.top
anchors.topMargin: parseInt(UM.Theme.getSize("sidebar_margin").height / 2)
anchors.topMargin: 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 parseInt(((base.width * 0.55) - width) / 2)
return ((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 parseInt((base.width * 0.55 / qualityModel.totalTicks) * index - (width / 2))
return (base.width * 0.55 / qualityModel.totalTicks) * index - (width / 2)
}
}
}
@ -310,7 +310,7 @@ Item
}
}
Label
Text
{
id: speedLabel
anchors.top: speedSlider.bottom
@ -322,7 +322,7 @@ Item
color: UM.Theme.getColor("text")
}
Label
Text
{
anchors.bottom: speedLabel.bottom
anchors.left: speedSlider.left
@ -333,7 +333,7 @@ Item
horizontalAlignment: Text.AlignLeft
}
Label
Text
{
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
Label
Text
{
id: infillLabel
text: catalog.i18nc("@label", "Infill")
@ -385,7 +385,7 @@ Item
anchors.top: infillCellLeft.top
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
Label {
Text {
id: selectedInfillRateText
//anchors.top: parent.top
@ -482,7 +482,7 @@ Item
anchors.right: parent.right
anchors.top: parent.top
anchors.topMargin: parseInt(UM.Theme.getSize("sidebar_margin").height / 2)
anchors.topMargin: 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: parseInt(UM.Theme.getSize("sidebar_margin").height / 2) // closer to slider since it belongs to the same category
anchors.topMargin: 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
@ -566,10 +566,10 @@ Item
}
}
Label {
Text {
id: gradualInfillLabel
anchors.left: enableGradualInfillCheckBox.right
anchors.leftMargin: parseInt(UM.Theme.getSize("sidebar_margin").width / 2)
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width / 2
text: catalog.i18nc("@label", "Enable gradual")
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
@ -624,13 +624,13 @@ Item
//
// Enable support
//
Label
Text
{
id: enableSupportLabel
visible: enableSupportCheckBox.visible
anchors.top: infillCellRight.bottom
anchors.topMargin: parseInt(UM.Theme.getSize("sidebar_margin").height * 1.5)
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height * 1.5
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
anchors.verticalCenter: enableSupportCheckBox.verticalCenter
@ -677,7 +677,7 @@ Item
}
}
Label
Text
{
id: supportExtruderLabel
visible: supportExtruderCombobox.visible
@ -753,7 +753,7 @@ Item
}
Label
Text
{
id: adhesionHelperLabel
visible: adhesionCheckBox.visible
@ -839,12 +839,12 @@ Item
{
id: tipsCell
anchors.top: adhesionCheckBox.visible ? adhesionCheckBox.bottom : (enableSupportCheckBox.visible ? supportExtruderCombobox.bottom : infillCellRight.bottom)
anchors.topMargin: parseInt(UM.Theme.getSize("sidebar_margin").height * 2)
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height * 2
anchors.left: parent.left
width: parent.width
height: tipsText.contentHeight * tipsText.lineCount
Label
Text
{
id: tipsText
anchors.left: parent.left