diff --git a/plugins/Toolbox/resources/qml/components/ToolboxActionButtonStyle.qml b/plugins/Toolbox/resources/qml/components/ToolboxActionButtonStyle.qml deleted file mode 100644 index 4c8504781a..0000000000 --- a/plugins/Toolbox/resources/qml/components/ToolboxActionButtonStyle.qml +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) 2018 Ultimaker B.V. -// Toolbox is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.2 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 -import UM 1.5 as UM - -ButtonStyle -{ - background: Rectangle - { - implicitWidth: UM.Theme.getSize("toolbox_action_button").width - implicitHeight: UM.Theme.getSize("toolbox_action_button").height - color: "transparent" - border - { - width: UM.Theme.getSize("default_lining").width - color: UM.Theme.getColor("lining") - } - } - label: UM.Label - { - text: control.text - horizontalAlignment: Text.AlignHCenter - } -} \ No newline at end of file diff --git a/plugins/Toolbox/resources/qml/components/ToolboxCompatibilityChart.qml b/plugins/Toolbox/resources/qml/components/ToolboxCompatibilityChart.qml index 265610a55e..c749cd876b 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxCompatibilityChart.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxCompatibilityChart.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Toolbox is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -58,14 +58,12 @@ Item { color: UM.Theme.getColor("main_background") height: UM.Theme.getSize("toolbox_chart_row").height - Label + UM.Label { anchors.verticalCenter: parent.verticalCenter elide: Text.ElideRight text: styleData.value || "" - color: UM.Theme.getColor("text") font: UM.Theme.getFont("default_bold") - renderType: Text.NativeRendering } Rectangle { @@ -78,14 +76,12 @@ Item rowDelegate: Item { height: UM.Theme.getSize("toolbox_chart_row").height - Label + UM.Label { anchors.verticalCenter: parent.verticalCenter elide: Text.ElideRight text: styleData.value || "" color: UM.Theme.getColor("text_medium") - font: UM.Theme.getFont("default") - renderType: Text.NativeRendering } } itemDelegate: Item diff --git a/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml b/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml index d683877605..db6999a491 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml @@ -1,9 +1,7 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Toolbox is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 import UM 1.5 as UM import Cura 1.1 as Cura @@ -50,16 +48,12 @@ Column } } - Label + UM.Label { wrapMode: Text.WordWrap text: catalog.i18nc("@label:The string between and is the highlighted link", "Log in is required to install or update") - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text") - linkColor: UM.Theme.getColor("text_link") visible: loginRequired width: installButton.width - renderType: Text.NativeRendering MouseArea { @@ -68,7 +62,7 @@ Column } } - Label + UM.Label { property var whereToBuyUrl: { @@ -76,12 +70,8 @@ Column return (pg_name in packageData.links) ? packageData.links[pg_name] : undefined } - renderType: Text.NativeRendering text: catalog.i18nc("@label:The string between and is the highlighted link", "Buy material spools") - linkColor: UM.Theme.getColor("text_link") visible: whereToBuyUrl != undefined - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text") MouseArea { anchors.fill: parent diff --git a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsGridTile.qml b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsGridTile.qml index c53c80f2ea..511d0ac91e 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsGridTile.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsGridTile.qml @@ -2,8 +2,6 @@ // Toolbox is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.3 import UM 1.5 as UM import Cura 1.1 as Cura diff --git a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml index a42a10aa29..e2c46c6077 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml @@ -2,9 +2,7 @@ // Toolbox is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 -import UM 1.1 as UM +import UM 1.5 as UM Rectangle { @@ -21,7 +19,7 @@ Rectangle { width: parent.width - parent.padding * 2 height: childrenRect.height - Label + UM.Label { id: heading text: catalog.i18nc("@label", "Premium") @@ -29,7 +27,6 @@ Rectangle height: contentHeight color: UM.Theme.getColor("text_medium") font: UM.Theme.getFont("large") - renderType: Text.NativeRendering } UM.TooltipArea { @@ -37,16 +34,12 @@ Rectangle height: childrenRect.height anchors.right: parent.right text: catalog.i18nc("@info:tooltip", "Go to Web Marketplace") - Label + UM.Label { text: "".arg(toolbox.getWebMarketplaceUrl("materials") + "?utm_source=cura&utm_medium=software&utm_campaign=marketplace-search") + catalog.i18nc("@label", "Search materials") + "" width: contentWidth height: contentHeight horizontalAlignment: Text.AlignRight - font: UM.Theme.getFont("default") - renderType: Text.NativeRendering - - linkColor: UM.Theme.getColor("text_link") onLinkActivated: Qt.openUrlExternally(link) visible: toolbox.viewCategory === "material" diff --git a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml index 2e8162b0fb..c4d92f7df1 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml @@ -2,8 +2,6 @@ // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 import UM 1.5 as UM diff --git a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml index 2c43110af9..a84def7859 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml @@ -2,7 +2,6 @@ // Toolbox is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 -import QtQuick.Controls 1.4 import UM 1.4 as UM import Cura 1.0 as Cura diff --git a/plugins/Toolbox/resources/qml/components/ToolboxInstalledTile.qml b/plugins/Toolbox/resources/qml/components/ToolboxInstalledTile.qml index 80acac924b..08156f2720 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxInstalledTile.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxInstalledTile.qml @@ -2,8 +2,6 @@ // Toolbox is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 import UM 1.5 as UM Item @@ -44,7 +42,7 @@ Item topPadding: UM.Theme.getSize("narrow_margin").height property var color: model.type === "plugin" && !isEnabled ? UM.Theme.getColor("lining") : UM.Theme.getColor("text") width: Math.floor(tileRow.width - (authorInfo.width + pluginActions.width + 2 * tileRow.spacing + ((disableButton.visible) ? disableButton.width + tileRow.spacing : 0))) - Label + UM.Label { text: model.name width: parent.width @@ -53,9 +51,8 @@ Item wrapMode: Text.WordWrap font: UM.Theme.getFont("large_bold") color: pluginInfo.color - renderType: Text.NativeRendering } - Label + UM.Label { text: model.description font: UM.Theme.getFont("default") @@ -64,7 +61,6 @@ Item width: parent.width wrapMode: Text.WordWrap color: pluginInfo.color - renderType: Text.NativeRendering } } Column diff --git a/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml b/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml index 1726497c00..8ee3de8e0b 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml @@ -2,9 +2,7 @@ // Toolbox is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 -import UM 1.1 as UM +import UM 1.5 as UM import Cura 1.1 as Cura @@ -16,15 +14,13 @@ Column width: UM.Theme.getSize("toolbox_action_button").width spacing: UM.Theme.getSize("narrow_margin").height - Label + UM.Label { visible: !model.is_installed text: catalog.i18nc("@label", "Will install upon restarting") color: UM.Theme.getColor("lining") - font: UM.Theme.getFont("default") wrapMode: Text.WordWrap width: parent.width - renderType: Text.NativeRendering } ToolboxProgressButton @@ -47,16 +43,12 @@ Column visible: canUpdate } - Label + UM.Label { wrapMode: Text.WordWrap text: catalog.i18nc("@label:The string between and is the highlighted link", "Log in is required to update") - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text") - linkColor: UM.Theme.getColor("text_link") visible: loginRequired width: updateButton.width - renderType: Text.NativeRendering MouseArea {