3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixed conflicts

Browse source
This commit is contained in:
10r3n20 2021-11-17 10:07:42 +01:00
commit cc401e107e
6 changed files with 158 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

91
plugins/Marketplace/resources/qml/Marketplace.qml
View file

@ -14,6 +14,8 @@ Window
id: marketplaceDialog
property variant catalog: UM.I18nCatalog { name: "cura" }
signal searchStringChanged(string new_search)
minimumWidth: UM.Theme.getSize("modal_window_minimum").width
minimumHeight: UM.Theme.getSize("modal_window_minimum").height
width: minimumWidth
@ -70,36 +72,82 @@ Window
}
}
// Search & Top-Level Tabs
Item
{
Layout.preferredWidth: parent.width
Layout.preferredHeight: childrenRect.height
// Page selection.
TabBar
Layout.preferredWidth: parent.width - 2 * UM.Theme.getSize("thin_margin").width
RowLayout
{
id: pageSelectionTabBar
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width
height: UM.Theme.getSize("button_icon").height
spacing: 0
width: parent.width
height: UM.Theme.getSize("button_icon").height + UM.Theme.getSize("default_margin").height
spacing: UM.Theme.getSize("thin_margin").width
PackageTypeTab
Rectangle
{
width: implicitWidth
text: catalog.i18nc("@button", "Plugins")
onClicked: content.source = "Plugins.qml"
Layout.preferredHeight: parent.height
Layout.preferredWidth: searchBar.visible ? UM.Theme.getSize("thin_margin").width : 0
Layout.fillWidth: ! searchBar.visible
}
PackageTypeTab
Cura.SearchBar
{
width: implicitWidth
text: catalog.i18nc("@button", "Materials")
onClicked: content.source = "Materials.qml"
id: searchBar
Layout.preferredHeight: parent.height
Layout.fillWidth: true
onTextEdited: searchStringChanged(text)
}
ManagePackagesButton
// Page selection.
TabBar
{
onClicked: content.source = "ManagedPackages.qml"
id: pageSelectionTabBar
anchors.right: parent.right
height: UM.Theme.getSize("button_icon").height
spacing: 0
PackageTypeTab
{
id: pluginTabText
width: implicitWidth
text: catalog.i18nc("@button", "Plugins")
onClicked:
{
searchBar.text = ""
searchBar.visible = true
content.source = "Plugins.qml"
}
}
PackageTypeTab
{
id: materialsTabText
width: implicitWidth
text: catalog.i18nc("@button", "Materials")
onClicked:
{
searchBar.text = ""
searchBar.visible = true
content.source = "Materials.qml"
}
}
ManagePackagesButton
{
onClicked: content.source = "ManagedPackages.qml"
}
}
TextMetrics
{
id: pluginTabTextMetrics
text: pluginTabText.text
font: pluginTabText.font
}
TextMetrics
{
id: materialsTabTextMetrics
text: materialsTabText.text
font: materialsTabText.font
}
}
}
@ -124,6 +172,11 @@ Window
function onLoaded()
{
pageTitle.text = content.item.pageTitle
searchStringChanged.connect(handleSearchStringChanged)
}
function handleSearchStringChanged(new_search)
{
content.item.model.searchString = new_search
}
}
}

34
plugins/Marketplace/resources/qml/PackageCard.qml
View file

@ -12,7 +12,7 @@ Rectangle
{
property var packageData
width: parent ? parent.width - UM.Theme.getSize("default_margin").width : 0
width: parent ? parent.width - UM.Theme.getSize("thin_margin").width : 0
height: childrenRect.height
color: UM.Theme.getColor("main_background")
@ -109,12 +109,17 @@ Rectangle
visible: parent.hovered
}
UM.RecolorImage
Rectangle
{
anchors.fill: parent
color: UM.Theme.getColor("primary")
source: UM.Theme.getIcon("CheckCircle")
color: UM.Theme.getColor("action_button_hovered")
radius: width
UM.RecolorImage
{
anchors.fill: parent
color: UM.Theme.getColor("primary")
source: UM.Theme.getIcon("CheckCircle")
}
}
//NOTE: Can we link to something here? (Probably a static link explaining what verified is):
@ -159,7 +164,7 @@ Rectangle
color: UM.Theme.getColor("text")
}
Button
UM.SimpleButton
{
id: externalLinkButton
@ -167,19 +172,10 @@ Rectangle
Layout.preferredHeight: UM.Theme.getSize("card_tiny_icon").height
Layout.alignment: Qt.AlignTop
Rectangle
{
anchors.fill: parent
color: externalLinkButton.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("detail_background")
UM.RecolorImage
{
anchors.fill: parent
color: externalLinkButton.hovered ? UM.Theme.getColor("text_link") : UM.Theme.getColor("text")
source: UM.Theme.getIcon("LinkExternal")
}
}
iconSource: UM.Theme.getIcon("LinkExternal")
hoverColor: UM.Theme.getColor("text_link")
backgroundColor: UM.Theme.getColor("detail_background")
hoverBackgroundColor: UM.Theme.getColor("action_button_hovered")
onClicked: Qt.openUrlExternally(packageData.packageInfoUrl)
}
}