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 5

Merge branch 'master' into feature_setting_visibility_profiles

Browse source
This commit is contained in:
fieldOfView 2018-03-09 15:45:24 +01:00
commit 4c66c935af
52 changed files with 1347 additions and 1067 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,6 +47,19 @@ TabView
return Math.round(diameter);
}
// This trick makes sure to make all fields lose focus so their onEditingFinished will be triggered
// and modified values will be saved. This can happen when a user changes a value and then closes the
// dialog directly.
//
// Please note that somehow this callback is ONLY triggered when visible is false.
onVisibleChanged:
{
if (!visible)
{
base.focus = false;
}
}
Tab
{
title: catalog.i18nc("@title", "Information")

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

@ -52,6 +52,24 @@ Item
return base.currentItem.root_material_id == root_material_id;
}
Component.onCompleted:
{
// Select the activated material when this page shows up
const extruder_position = Cura.ExtruderManager.activeExtruderIndex;
const active_root_material_id = Cura.MachineManager.currentRootMaterialId[extruder_position];
var itemIndex = -1;
for (var i = 0; i < materialsModel.rowCount(); ++i)
{
var item = materialsModel.getItem(i);
if (item.root_material_id == active_root_material_id)
{
itemIndex = i;
break;
}
}
materialListView.currentIndex = itemIndex;
}
Row // Button Row
{
id: buttonRow

17
resources/qml/Preferences/ProfileTab.qml
View file

@ -14,6 +14,15 @@ Tab
property string extruderPosition: ""
property var qualityItem: null
property bool isQualityItemCurrentlyActivated:
{
if (qualityItem == null)
{
return false;
}
return qualityItem.name == Cura.MachineManager.activeQualityOrQualityChangesName;
}
TableView
{
anchors.fill: parent
@ -36,8 +45,8 @@ Tab
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.right: parent.right
text: (styleData.value.substr(0,1) == "=") ? catalog.i18nc("@info:status", "Calculated") : styleData.value
font.strikeout: styleData.column == 1 && setting.user_value != "" && qualityItem.name == Cura.MachineManager.activeQualityOrQualityChangesName
font.italic: setting.profile_value_source == "quality_changes" || (setting.user_value != "" && qualityItem.name == Cura.MachineManager.activeQualityOrQualityChangesName)
font.strikeout: styleData.column == 1 && setting.user_value != "" && base.isQualityItemCurrentlyActivated
font.italic: setting.profile_value_source == "quality_changes" || (setting.user_value != "" && base.isQualityItemCurrentlyActivated)
opacity: font.strikeout ? 0.5 : 1
color: styleData.textColor
elide: Text.ElideRight
@ -63,7 +72,7 @@ Tab
{
role: "user_value"
title: catalog.i18nc("@title:column", "Current");
visible: qualityItem.name == Cura.MachineManager.activeQualityOrQualityChangesName
visible: base.isQualityItemCurrentlyActivated
width: (parent.width * 0.18) | 0
delegate: itemDelegate
}
@ -86,7 +95,7 @@ Tab
{
id: qualitySettings
selectedPosition: base.extruderPosition
selectedQualityItem: base.qualityItem
selectedQualityItem: base.qualityItem == null ? {} : base.qualityItem
}
SystemPalette { id: palette }

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

@ -36,13 +36,15 @@ Item
text: catalog.i18nc("@title:tab", "Profiles")
}
property var hasCurrentItem: qualityListView.currentItem != null
property var hasCurrentItem: base.currentItem != null
property var currentItem: {
var current_index = qualityListView.currentIndex;
return qualitiesModel.getItem(current_index);
return (current_index == -1) ? null : qualitiesModel.getItem(current_index);
}
property var currentItemName: hasCurrentItem ? base.currentItem.name : ""
property var isCurrentItemActivated: {
if (!base.currentItem) {
return false;
@ -235,7 +237,7 @@ Item
icon: StandardIcon.Question;
title: catalog.i18nc("@title:window", "Confirm Remove")
text: catalog.i18nc("@label (%1 is object name)", "Are you sure you wish to remove %1? This cannot be undone!").arg(base.currentItem.name)
text: catalog.i18nc("@label (%1 is object name)", "Are you sure you wish to remove %1? This cannot be undone!").arg(base.currentItemName)
standardButtons: StandardButton.Yes | StandardButton.No
modality: Qt.ApplicationModal
@ -437,6 +439,7 @@ Item
Item
{
anchors.fill: parent
visible: base.currentItem != null
Item // Profile title Label
{
@ -446,7 +449,7 @@ Item
height: childrenRect.height
Label {
text: base.currentItem.name
text: base.currentItemName
font: UM.Theme.getFont("large")
}
}