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

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
Download patch file Download diff file Expand all files Collapse all files

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

@ -215,7 +215,7 @@ UM.PreferencesPage
textRole: "text"
model: languageList
implicitWidth: UM.Theme.getSize("setting_control").width
implicitWidth: UM.Theme.getSize("combobox_wide").width
implicitHeight: currencyField.height
function setCurrentIndex() {
@ -255,7 +255,7 @@ UM.PreferencesPage
id: currencyField
selectByMouse: true
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)
}
@ -284,7 +284,7 @@ UM.PreferencesPage
model: themeList
textRole: "text"
implicitWidth: UM.Theme.getSize("setting_control").width
implicitWidth: UM.Theme.getSize("combobox_wide").width
implicitHeight: currencyField.height
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.
height: contentHeight
elide: Text.ElideRight
wrapMode: Text.NoWrap
}
UM.Label
{
text: activeQualityDetailText()
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text_detail")
Layout.margins: 0
Layout.fillWidth: true
height: contentHeight
elide: Text.ElideRight
wrapMode: Text.NoWrap
function activeQualityDetailText()
{
var resultMap = Cura.MachineManager.activeQualityDisplayNameMap

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

@ -134,7 +134,7 @@ Item
id: label
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.verticalCenter: parent.verticalCenter