From 3b4e253e989d89dca5eb5fac5073a13545bce2c7 Mon Sep 17 00:00:00 2001 From: Satish Date: Tue, 7 May 2019 12:37:42 +0200 Subject: [PATCH] Added ids to materials for squish tests -Added a text property to MaterialsBrandSection -Added ids to materials menu buttons --- .../qml/Preferences/Materials/MaterialsBrandSection.qml | 3 ++- resources/qml/Preferences/Materials/MaterialsList.qml | 1 + resources/qml/Preferences/Materials/MaterialsPage.qml | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml index 8db8e99d44..537e60983a 100644 --- a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml +++ b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml @@ -13,7 +13,8 @@ import Cura 1.0 as Cura Item { id: brand_section - + + property var text: "" property var sectionName: "" property var elementsModel // This can be a MaterialTypesModel or GenericMaterialsModel or FavoriteMaterialsModel property var hasMaterialTypes: true // It indicates wheather it has material types or not diff --git a/resources/qml/Preferences/Materials/MaterialsList.qml b/resources/qml/Preferences/Materials/MaterialsList.qml index 61f92db84c..45956c350b 100644 --- a/resources/qml/Preferences/Materials/MaterialsList.qml +++ b/resources/qml/Preferences/Materials/MaterialsList.qml @@ -159,6 +159,7 @@ Item delegate: MaterialsBrandSection { id: brandSection + text: model.name sectionName: model.name elementsModel: model.material_types hasMaterialTypes: true diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml index 2f126d8a1f..26f858fcc8 100644 --- a/resources/qml/Preferences/Materials/MaterialsPage.qml +++ b/resources/qml/Preferences/Materials/MaterialsPage.qml @@ -81,6 +81,7 @@ Item // Activate button Button { + id: activateMenuButton text: catalog.i18nc("@action:button", "Activate") iconName: "list-activate" enabled: !isCurrentItemActivated && Cura.MachineManager.hasMaterials @@ -98,6 +99,7 @@ Item // Create button Button { + id: createMenuButton text: catalog.i18nc("@action:button", "Create") iconName: "list-add" onClicked: @@ -111,6 +113,7 @@ Item // Duplicate button Button { + id: duplicateMenuButton text: catalog.i18nc("@action:button", "Duplicate"); iconName: "list-add" enabled: base.hasCurrentItem @@ -125,6 +128,7 @@ Item // Remove button Button { + id: removeMenuButton text: catalog.i18nc("@action:button", "Remove") iconName: "list-remove" enabled: base.hasCurrentItem && !base.currentItem.is_read_only && !base.isCurrentItemActivated && base.materialManager.canMaterialBeRemoved(base.currentItem.container_node) @@ -138,6 +142,7 @@ Item // Import button Button { + id: importMenuButton text: catalog.i18nc("@action:button", "Import") iconName: "document-import" onClicked: @@ -151,6 +156,7 @@ Item // Export button Button { + id: exportMenuButton text: catalog.i18nc("@action:button", "Export") iconName: "document-export" onClicked: