3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-28 13:21:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'master' into feature_setting_visibility_profiles

Browse source 
# Conflicts:
#	resources/qml/Settings/SettingView.qml
This commit is contained in:
fieldOfView 2018-02-15 11:54:45 +01:00
commit a17160f52d
129 changed files with 1937 additions and 1538 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -163,7 +163,7 @@ UM.PreferencesPage
append({ text: "Русский", code: "ru_RU" })
append({ text: "Türkçe", code: "tr_TR" })
append({ text: "简体中文", code: "zh_CN" })
append({ text: "正體字", code: "zh_TW" })
//Traditional Chinese is disabled for being incomplete: append({ text: "正體字", code: "zh_TW" })
var date_object = new Date();
if (date_object.getUTCMonth() == 8 && date_object.getUTCDate() == 19) //Only add Pirate on the 19th of September.
@ -413,7 +413,7 @@ UM.PreferencesPage
width: childrenRect.width;
height: childrenRect.height;
text: catalog.i18nc("@info:tooltip","Show caution message in gcode reader.")
text: catalog.i18nc("@info:tooltip","Show caution message in g-code reader.")
CheckBox
{
@ -422,7 +422,7 @@ UM.PreferencesPage
checked: boolCheck(UM.Preferences.getValue("gcodereader/show_caution"))
onClicked: UM.Preferences.setValue("gcodereader/show_caution", checked)
text: catalog.i18nc("@option:check","Caution message in gcode reader");
text: catalog.i18nc("@option:check","Caution message in g-code reader");
}
}

11
resources/qml/Preferences/MaterialView.qml
View file

@ -98,15 +98,15 @@ TabView
Row {
width: scrollView.columnWidth
height: parent.rowHeight
spacing: Math.floor(UM.Theme.getSize("default_margin").width/2)
spacing: Math.round(UM.Theme.getSize("default_margin").width / 2)
// color indicator square
Rectangle {
id: colorSelector
color: properties.color_code
width: Math.floor(colorLabel.height * 0.75)
height: Math.floor(colorLabel.height * 0.75)
width: Math.round(colorLabel.height * 0.75)
height: Math.round(colorLabel.height * 0.75)
border.width: UM.Theme.getSize("default_lining").height
anchors.verticalCenter: parent.verticalCenter
@ -407,7 +407,10 @@ TabView
if (old_value != new_value) {
Cura.ContainerManager.setContainerMetaDataEntry(base.containerId, entry_name, new_value)
// make sure the UI properties are updated as well since we don't re-fetch the entire model here
properties[entry_name] = new_value
// When the entry_name is something like properties/diameter, we take the last part of the entry_name
var list = entry_name.split("/")
var key = list[list.length - 1]
properties[key] = new_value
}
}

14
resources/qml/Preferences/MaterialsPage.qml
View file

@ -59,15 +59,15 @@ UM.ManagementPage
anchors.right: parent.right
Rectangle
{
width: (parent.height * 0.8) | 0
height: (parent.height * 0.8) | 0
width: Math.round(parent.height * 0.8)
height: Math.round(parent.height * 0.8)
color: model.metadata.color_code
border.color: isCurrentItem ? palette.highlightedText : palette.text;
anchors.verticalCenter: parent.verticalCenter
}
Label
{
width: Math.floor((parent.width * 0.3))
width: Math.round((parent.width * 0.3))
text: model.metadata.material
elide: Text.ElideRight
font.italic: model.id == activeId
@ -111,14 +111,12 @@ UM.ManagementPage
scrollviewCaption:
{
var caption = catalog.i18nc("@action:label", "Printer") + ": " + Cura.MachineManager.activeMachineName;
if (Cura.MachineManager.hasVariants)
{
catalog.i18nc("@action:label %1 is printer name, %2 is how this printer names variants, %3 is variant name", "Printer: %1, %2: %3").arg(Cura.MachineManager.activeMachineName).arg(Cura.MachineManager.activeDefinitionVariantsName).arg(Cura.MachineManager.activeVariantName)
}
else
{
catalog.i18nc("@action:label %1 is printer name","Printer: %1").arg(Cura.MachineManager.activeMachineName)
caption += ", " + Cura.MachineManager.activeDefinitionVariantsName + ": " + Cura.MachineManager.activeVariantName;
}
return caption;
}
detailsVisible: true