From 6dc535063b41d1b374cbf6f976ffb66329bc39f3 Mon Sep 17 00:00:00 2001 From: casper Date: Mon, 24 Jan 2022 22:37:39 +0100 Subject: [PATCH] Update profiles preferences page to QtControls 2 CURA-8684 --- resources/qml/Preferences/ProfilesPage.qml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index 9144d4dbe1..5176b4c188 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -2,7 +2,8 @@ // Uranium is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick.Controls 1.4 as OldControls +import QtQuick.Controls 2.1 import QtQuick.Layouts 1.3 import QtQuick.Dialogs 1.2 @@ -82,7 +83,7 @@ Item { id: activateMenuButton text: catalog.i18nc("@action:button", "Activate") - iconName: "list-activate" + icon.name: "list-activate" enabled: !isCurrentItemActivated && base.currentItem onClicked: { @@ -102,7 +103,7 @@ Item { id: createMenuButton text: catalog.i18nc("@label", "Create") - iconName: "list-add" + icon.name: "list-add" enabled: base.canCreateProfile && !Cura.MachineManager.stacksHaveErrors visible: base.canCreateProfile @@ -119,7 +120,7 @@ Item { id: duplicateMenuButton text: catalog.i18nc("@label", "Duplicate") - iconName: "list-add" + icon.name: "list-add" enabled: !base.canCreateProfile visible: !base.canCreateProfile @@ -136,7 +137,7 @@ Item { id: removeMenuButton text: catalog.i18nc("@action:button", "Remove") - iconName: "list-remove" + icon.name: "list-remove" enabled: base.hasCurrentItem && !base.currentItem.is_read_only && !base.isCurrentItemActivated onClicked: { @@ -150,7 +151,7 @@ Item { id: renameMenuButton text: catalog.i18nc("@action:button", "Rename") - iconName: "edit-rename" + icon.name: "edit-rename" enabled: base.hasCurrentItem && !base.currentItem.is_read_only onClicked: { @@ -165,7 +166,7 @@ Item { id: importMenuButton text: catalog.i18nc("@action:button", "Import") - iconName: "document-import" + icon.name: "document-import" onClicked: { importDialog.open(); @@ -177,7 +178,7 @@ Item { id: exportMenuButton text: catalog.i18nc("@action:button", "Export") - iconName: "document-export" + icon.name: "document-export" enabled: base.hasCurrentItem && !base.currentItem.is_read_only onClicked: { @@ -401,7 +402,7 @@ Item elide: Text.ElideRight } - ScrollView + OldControls.ScrollView { id: profileScrollView anchors @@ -594,7 +595,7 @@ Item } } - TabView + OldControls.TabView { anchors.left: parent.left anchors.top: profileNotices.visible ? profileNotices.bottom : profileNotices.anchors.top