GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 15:54:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ultimaker/Cura into CURA-8979_Materials_Preference_Page

Browse Source
This commit is contained in:
Jaime van Kessel 2022-03-15 11:07:44 +01:00
commit f9814520f7
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/PerObjectSettingsTool/PerObjectCategory.qml
View File

@ -5,6 +5,7 @@ import QtQuick 2.2
import QtQuick.Controls 2.1 import QtQuick.Controls 2.1
import Cura 1.5 as Cura import Cura 1.5 as Cura
import UM 1.5 as UM
import ".." import ".."
Cura.CategoryButton Cura.CategoryButton

6
resources/qml/Preferences/GeneralPage.qml
View File

@ -215,7 +215,7 @@ UM.PreferencesPage
textRole: "text" textRole: "text"
model: languageList model: languageList
implicitWidth: UM.Theme.getSize("setting_control").width implicitWidth: UM.Theme.getSize("combobox_wide").width
implicitHeight: currencyField.height implicitHeight: currencyField.height
function setCurrentIndex() { function setCurrentIndex() {
@ -255,7 +255,7 @@ UM.PreferencesPage
id: currencyField id: currencyField
selectByMouse: true selectByMouse: true
text: UM.Preferences.getValue("cura/currency") text: UM.Preferences.getValue("cura/currency")
implicitWidth: UM.Theme.getSize("setting_control").width implicitWidth: UM.Theme.getSize("combobox_wide").width
onTextChanged: UM.Preferences.setValue("cura/currency", text) onTextChanged: UM.Preferences.setValue("cura/currency", text)
} }
@ -284,7 +284,7 @@ UM.PreferencesPage
model: themeList model: themeList
textRole: "text" textRole: "text"
implicitWidth: UM.Theme.getSize("setting_control").width implicitWidth: UM.Theme.getSize("combobox_wide").width
implicitHeight: currencyField.height implicitHeight: currencyField.height
currentIndex: currentIndex:

4
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View File

@ -84,19 +84,19 @@ Item
Layout.maximumWidth: Math.floor(parent.width * 0.7) // Always leave >= 30% for the rest of the row. Layout.maximumWidth: Math.floor(parent.width * 0.7) // Always leave >= 30% for the rest of the row.
height: contentHeight height: contentHeight
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap
} }
UM.Label UM.Label
{ {
text: activeQualityDetailText() text: activeQualityDetailText()
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text_detail") color: UM.Theme.getColor("text_detail")
Layout.margins: 0 Layout.margins: 0
Layout.fillWidth: true Layout.fillWidth: true
height: contentHeight height: contentHeight
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap
function activeQualityDetailText() function activeQualityDetailText()
{ {
var resultMap = Cura.MachineManager.activeQualityDisplayNameMap var resultMap = Cura.MachineManager.activeQualityDisplayNameMap

2
resources/qml/Settings/SettingItem.qml
View File

@ -134,7 +134,7 @@ Item
id: label id: label
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: doDepthIndentation ? Math.round(UM.Theme.getSize("thin_margin").width + ((definition.depth - 1) * UM.Theme.getSize("narrow_margin").width)) : 0 anchors.leftMargin: doDepthIndentation ? Math.round(UM.Theme.getSize("thin_margin").width + ((definition.depth - 1) * UM.Theme.getSize("default_margin").width)) : 0
anchors.right: settingControls.left anchors.right: settingControls.left
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter

1
resources/quality/flsun_sr/flsun_sr_fine.inst.cfg
View File

@ -27,7 +27,6 @@ infill_before_walls = False
infill_enable_travel_optimization = False infill_enable_travel_optimization = False
infill_support_angle = 50 infill_support_angle = 50
ironing_enabled = False ironing_enabled = False
max_skin_angle_for_expansion = 20
retract_at_layer_change = False retract_at_layer_change = False
retraction_amount = 6.5 retraction_amount = 6.5
retraction_hop_only_when_collides = True retraction_hop_only_when_collides = True

1
resources/quality/flsun_sr/flsun_sr_normal.inst.cfg
View File

@ -27,7 +27,6 @@ infill_before_walls = False
infill_enable_travel_optimization = False infill_enable_travel_optimization = False
infill_support_angle = 50 infill_support_angle = 50
ironing_enabled = False ironing_enabled = False
max_skin_angle_for_expansion = 20
retract_at_layer_change = False retract_at_layer_change = False
retraction_amount = 6.5 retraction_amount = 6.5
retraction_hop_only_when_collides = True retraction_hop_only_when_collides = True