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

Merge branch 'master' of https://github.com/Ultimaker/Cura

Browse source
This commit is contained in:
fieldOfView 2016-10-04 13:14:27 +02:00
commit eb1cb3c0f2
9 changed files with 89 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,13 +90,14 @@ UM.PreferencesPage
id: languageList
Component.onCompleted: {
append({ text: catalog.i18nc("@item:inlistbox", "English"), code: "en" })
append({ text: catalog.i18nc("@item:inlistbox", "Finnish"), code: "fi" })
append({ text: catalog.i18nc("@item:inlistbox", "French"), code: "fr" })
append({ text: catalog.i18nc("@item:inlistbox", "German"), code: "de" })
append({ text: catalog.i18nc("@item:inlistbox", "Italian"), code: "it" })
append({ text: catalog.i18nc("@item:inlistbox", "Dutch"), code: "nl" })
append({ text: catalog.i18nc("@item:inlistbox", "Spanish"), code: "es" })
append({ text: "English", code: "en" })
append({ text: "Deutsch", code: "de" })
append({ text: "Español", code: "es" })
append({ text: "Suomi", code: "fi" })
append({ text: "Français", code: "fr" })
append({ text: "Italiano", code: "it" })
append({ text: "Nederlands", code: "nl" })
append({ text: "Türkçe", code: "tr" })
}
}

10
resources/qml/Preferences/ProfilesPage.qml
View file

@ -336,18 +336,16 @@ UM.ManagementPage
folder: CuraApplication.getDefaultPath("dialog_profile_path")
onAccepted:
{
var profiles_to_export = [base.currentItem.id]
for(var extruder_nr in base.extrudersModel.items)
{
profiles_to_export.push(ExtruderManager.getQualityChangesIdByExtruderStackId(base.extrudersModel.items[extruder_nr].id))
}
var result = base.model.exportProfile(profiles_to_export, fileUrl, selectedNameFilter)
var containers = Cura.ContainerManager.findInstanceContainers({"type": "quality_changes", "name": base.currentItem.name})
var result = base.model.exportProfile(containers, fileUrl, selectedNameFilter)
if(result && result.status == "error")
{
messageDialog.icon = StandardIcon.Critical
messageDialog.text = result.message
messageDialog.open()
}
// else pop-up Message thing from python code
CuraApplication.setDefaultPath("dialog_profile_path", folder)
}

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

@ -217,10 +217,9 @@ Item {
break;
}
}
if(last_entry == 4 && base.stackLevel == 0 && base.stackLevels.length == 2)
if((last_entry == 4 || last_entry == 11) && base.stackLevel == 0 && base.stackLevels.length == 2)
{
// Special case of the inherit reset. If only the definition (4th container) and the first
// Special case of the inherit reset. If only the definition (4th or 11th) container) and the first
// entry (user container) are set, we can simply remove the container.
propertyProvider.removeFromContainer(0)
}

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

@ -137,6 +137,8 @@ ScrollView
key: model.key ? model.key : ""
watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve" ]
storeIndex: 0
// Due to the way setPropertyValue works, removeUnusedValue gives the correct output in case of resolve
removeUnusedValue: model.resolve == undefined
}
Connections