Remove multiple references to controls 1

This commit is contained in:
Jaime van Kessel 2021-11-10 17:24:28 +01:00
parent f71502fe38
commit ea8969fe4e
9 changed files with 14 additions and 79 deletions

View file

@ -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
}
}

View file

@ -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. // Toolbox is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
@ -58,14 +58,12 @@ Item
{ {
color: UM.Theme.getColor("main_background") color: UM.Theme.getColor("main_background")
height: UM.Theme.getSize("toolbox_chart_row").height height: UM.Theme.getSize("toolbox_chart_row").height
Label UM.Label
{ {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
elide: Text.ElideRight elide: Text.ElideRight
text: styleData.value || "" text: styleData.value || ""
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default_bold") font: UM.Theme.getFont("default_bold")
renderType: Text.NativeRendering
} }
Rectangle Rectangle
{ {
@ -78,14 +76,12 @@ Item
rowDelegate: Item rowDelegate: Item
{ {
height: UM.Theme.getSize("toolbox_chart_row").height height: UM.Theme.getSize("toolbox_chart_row").height
Label UM.Label
{ {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
elide: Text.ElideRight elide: Text.ElideRight
text: styleData.value || "" text: styleData.value || ""
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
font: UM.Theme.getFont("default")
renderType: Text.NativeRendering
} }
} }
itemDelegate: Item itemDelegate: Item

View file

@ -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. // Toolbox is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import UM 1.5 as UM import UM 1.5 as UM
import Cura 1.1 as Cura import Cura 1.1 as Cura
@ -50,16 +48,12 @@ Column
} }
} }
Label UM.Label
{ {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: catalog.i18nc("@label:The string between <a href=> and </a> is the highlighted link", "<a href='%1'>Log in</a> is required to install or update") text: catalog.i18nc("@label:The string between <a href=> and </a> is the highlighted link", "<a href='%1'>Log in</a> is required to install or update")
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
linkColor: UM.Theme.getColor("text_link")
visible: loginRequired visible: loginRequired
width: installButton.width width: installButton.width
renderType: Text.NativeRendering
MouseArea MouseArea
{ {
@ -68,7 +62,7 @@ Column
} }
} }
Label UM.Label
{ {
property var whereToBuyUrl: property var whereToBuyUrl:
{ {
@ -76,12 +70,8 @@ Column
return (pg_name in packageData.links) ? packageData.links[pg_name] : undefined return (pg_name in packageData.links) ? packageData.links[pg_name] : undefined
} }
renderType: Text.NativeRendering
text: catalog.i18nc("@label:The string between <a href=> and </a> is the highlighted link", "<a href='%1'>Buy material spools</a>") text: catalog.i18nc("@label:The string between <a href=> and </a> is the highlighted link", "<a href='%1'>Buy material spools</a>")
linkColor: UM.Theme.getColor("text_link")
visible: whereToBuyUrl != undefined visible: whereToBuyUrl != undefined
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
MouseArea MouseArea
{ {
anchors.fill: parent anchors.fill: parent

View file

@ -2,8 +2,6 @@
// Toolbox is released under the terms of the LGPLv3 or higher. // Toolbox is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import UM 1.5 as UM import UM 1.5 as UM
import Cura 1.1 as Cura import Cura 1.1 as Cura

View file

@ -2,9 +2,7 @@
// Toolbox is released under the terms of the LGPLv3 or higher. // Toolbox is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 1.4 import UM 1.5 as UM
import QtQuick.Controls.Styles 1.4
import UM 1.1 as UM
Rectangle Rectangle
{ {
@ -21,7 +19,7 @@ Rectangle
{ {
width: parent.width - parent.padding * 2 width: parent.width - parent.padding * 2
height: childrenRect.height height: childrenRect.height
Label UM.Label
{ {
id: heading id: heading
text: catalog.i18nc("@label", "Premium") text: catalog.i18nc("@label", "Premium")
@ -29,7 +27,6 @@ Rectangle
height: contentHeight height: contentHeight
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large")
renderType: Text.NativeRendering
} }
UM.TooltipArea UM.TooltipArea
{ {
@ -37,16 +34,12 @@ Rectangle
height: childrenRect.height height: childrenRect.height
anchors.right: parent.right anchors.right: parent.right
text: catalog.i18nc("@info:tooltip", "Go to Web Marketplace") text: catalog.i18nc("@info:tooltip", "Go to Web Marketplace")
Label UM.Label
{ {
text: "<a href='%2'>".arg(toolbox.getWebMarketplaceUrl("materials") + "?utm_source=cura&utm_medium=software&utm_campaign=marketplace-search") + catalog.i18nc("@label", "Search materials") + "</a>" text: "<a href='%2'>".arg(toolbox.getWebMarketplaceUrl("materials") + "?utm_source=cura&utm_medium=software&utm_campaign=marketplace-search") + catalog.i18nc("@label", "Search materials") + "</a>"
width: contentWidth width: contentWidth
height: contentHeight height: contentHeight
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
font: UM.Theme.getFont("default")
renderType: Text.NativeRendering
linkColor: UM.Theme.getColor("text_link")
onLinkActivated: Qt.openUrlExternally(link) onLinkActivated: Qt.openUrlExternally(link)
visible: toolbox.viewCategory === "material" visible: toolbox.viewCategory === "material"

View file

@ -2,8 +2,6 @@
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import UM 1.5 as UM import UM 1.5 as UM

View file

@ -2,7 +2,6 @@
// Toolbox is released under the terms of the LGPLv3 or higher. // Toolbox is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 1.4
import UM 1.4 as UM import UM 1.4 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura

View file

@ -2,8 +2,6 @@
// Toolbox is released under the terms of the LGPLv3 or higher. // Toolbox is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import UM 1.5 as UM import UM 1.5 as UM
Item Item
@ -44,7 +42,7 @@ Item
topPadding: UM.Theme.getSize("narrow_margin").height topPadding: UM.Theme.getSize("narrow_margin").height
property var color: model.type === "plugin" && !isEnabled ? UM.Theme.getColor("lining") : UM.Theme.getColor("text") 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))) 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 text: model.name
width: parent.width width: parent.width
@ -53,9 +51,8 @@ Item
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font: UM.Theme.getFont("large_bold") font: UM.Theme.getFont("large_bold")
color: pluginInfo.color color: pluginInfo.color
renderType: Text.NativeRendering
} }
Label UM.Label
{ {
text: model.description text: model.description
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
@ -64,7 +61,6 @@ Item
width: parent.width width: parent.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: pluginInfo.color color: pluginInfo.color
renderType: Text.NativeRendering
} }
} }
Column Column

View file

@ -2,9 +2,7 @@
// Toolbox is released under the terms of the LGPLv3 or higher. // Toolbox is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 1.4 import UM 1.5 as UM
import QtQuick.Controls.Styles 1.4
import UM 1.1 as UM
import Cura 1.1 as Cura import Cura 1.1 as Cura
@ -16,15 +14,13 @@ Column
width: UM.Theme.getSize("toolbox_action_button").width width: UM.Theme.getSize("toolbox_action_button").width
spacing: UM.Theme.getSize("narrow_margin").height spacing: UM.Theme.getSize("narrow_margin").height
Label UM.Label
{ {
visible: !model.is_installed visible: !model.is_installed
text: catalog.i18nc("@label", "Will install upon restarting") text: catalog.i18nc("@label", "Will install upon restarting")
color: UM.Theme.getColor("lining") color: UM.Theme.getColor("lining")
font: UM.Theme.getFont("default")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
width: parent.width width: parent.width
renderType: Text.NativeRendering
} }
ToolboxProgressButton ToolboxProgressButton
@ -47,16 +43,12 @@ Column
visible: canUpdate visible: canUpdate
} }
Label UM.Label
{ {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: catalog.i18nc("@label:The string between <a href=> and </a> is the highlighted link", "<a href='%1'>Log in</a> is required to update") text: catalog.i18nc("@label:The string between <a href=> and </a> is the highlighted link", "<a href='%1'>Log in</a> is required to update")
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
linkColor: UM.Theme.getColor("text_link")
visible: loginRequired visible: loginRequired
width: updateButton.width width: updateButton.width
renderType: Text.NativeRendering
MouseArea MouseArea
{ {