mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-07 15:07:28 -06:00
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-8979_Materials_Preference_Page
This commit is contained in:
commit
f9814520f7
6 changed files with 7 additions and 8 deletions
|
@ -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:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue