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

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

Browse source 
Conflicts:
	cura/MachineManagerModel.py
This commit is contained in:
Ghostkeeper 2016-06-06 16:41:34 +02:00
commit bcf7e0459b
3 changed files with 45 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,8 +66,8 @@ UM.ManagementPage
activateEnabled: currentItem != null ? currentItem.id != Cura.MachineManager.activeQualityId : false;
addEnabled: currentItem != null;
removeEnabled: currentItem != null ? !currentItem.readOnly : false;
renameEnabled: currentItem != null ? !currentItem.readOnly : false;
removeEnabled: currentItem != null ? !currentItem.metadata.read_only : false;
renameEnabled: currentItem != null ? !currentItem.metadata.read_only : false;
scrollviewCaption: catalog.i18nc("@label %1 is printer name","Printer: %1").arg(Cura.MachineManager.activeMachineName)
@ -137,7 +137,7 @@ UM.ManagementPage
Label {
text: base.currentItem == null ? "" :
base.currentItem.id == -1 ? Cura.MachineManager.activeQualityName:
base.currentItem.readOnly ? catalog.i18nc("@label", "Protected profile") : catalog.i18nc("@label", "Custom profile")
base.currentItem.metadata.read_only ? catalog.i18nc("@label", "Protected profile") : catalog.i18nc("@label", "Custom profile")
}
Column {
@ -186,7 +186,7 @@ UM.ManagementPage
{
id: confirmDialog;
object: base.currentItem != null ? base.currentItem.name : "";
onYes: base.model.removeProfile(base.currentItem.name);
onYes: Cura.MachineManager.removeQualityContainer(base.currentItem.id);
}
UM.RenameDialog
{

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

@ -24,6 +24,7 @@ ScrollView
{
id: contents
spacing: UM.Theme.getSize("default_lining").height;
cacheBuffer: 1000000; // A huge to cache to effectively cache everything.
model: UM.SettingDefinitionsModel {
id: definitionsModel;