3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 13:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'marketplace_navigation_improvements' of github.com:Ultimaker/Cura into marketplace_redesign

Browse source
This commit is contained in:
Jaime van Kessel 2021-11-17 10:51:49 +01:00
commit 71769ab168
3 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
plugins/Marketplace/resources/qml/ManagePackagesButton.qml
View file

@ -7,17 +7,21 @@ import Cura 1.6 as Cura
import QtQuick 2.15
import QtQuick.Controls 2.15
Button
TabButton
{
id: root
width: UM.Theme.getSize("button_icon").width
width: UM.Theme.getSize("button_icon").width+UM.Theme.getSize("narrow_margin").width
height: UM.Theme.getSize("button_icon").height
hoverEnabled: true
property color backgroundColor: hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button")
property color inactiveBackgroundColor : hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("detail_background")
property color activeBackgroundColor : UM.Theme.getColor("main_background")
leftInset: UM.Theme.getSize("narrow_margin").width
background: Rectangle
{
color: backgroundColor
color: parent.checked ? activeBackgroundColor : inactiveBackgroundColor
border.color: parent.checked ? UM.Theme.getColor("detail_background") : "transparent"
border.width: UM.Theme.getSize("thick_lining").width
radius: Math.round(width * 0.5)
}
@ -38,7 +42,8 @@ Button
color: UM.Theme.getColor("icon")
source: UM.Theme.getIcon("Settings")
anchors.centerIn: parent
anchors.horizontalCenter: parent.horizontalCenter
anchors.horizontalCenterOffset: Math.round(UM.Theme.getSize("narrow_margin").width /2)
anchors.verticalCenter: parent.verticalCenter
}
}

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

@ -102,15 +102,14 @@ Window
TabBar
{
id: pageSelectionTabBar
height: parent.height
width: implicitWidth
anchors.right: parent.right
height: UM.Theme.getSize("button_icon").height
spacing: 0
PackageTypeTab
{
id: pluginTabText
width: implicitWidth
padding: UM.Theme.getSize("thin_margin").width
text: catalog.i18nc("@button", "Plugins")
onClicked:
{
@ -123,7 +122,6 @@ Window
{
id: materialsTabText
width: implicitWidth
padding: UM.Theme.getSize("thin_margin").width
text: catalog.i18nc("@button", "Materials")
onClicked:
{
@ -132,7 +130,12 @@ Window
content.source = "Materials.qml"
}
}
ManagePackagesButton
{
onClicked: content.source = "ManagedPackages.qml"
}
}
TextMetrics
{
id: pluginTabTextMetrics
@ -144,21 +147,7 @@ Window
id: materialsTabTextMetrics
text: materialsTabText.text
font: materialsTabText.font
}
ManagePackagesButton
{
id: managePackagesButton
height: parent.height
width: UM.Theme.getSize("button_icon").width
onClicked:
{
searchBar.text = ""
searchBar.visible = false
content.source = "ManagedPackages.qml"
}
}
}
}
}

9
plugins/Marketplace/resources/qml/PackageTypeTab.qml
View file

@ -8,11 +8,16 @@ import UM 1.0 as UM
TabButton
{
property string pageTitle
padding: UM.Theme.getSize("narrow_margin").width
horizontalPadding: UM.Theme.getSize("default_margin").width
hoverEnabled: true
property color inactiveBackgroundColor : hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("detail_background")
property color activeBackgroundColor : UM.Theme.getColor("main_background")
background: Rectangle
{
anchors.fill: parent
color: parent.checked ? UM.Theme.getColor("main_background") : UM.Theme.getColor("detail_background")
color: parent.checked ? activeBackgroundColor : inactiveBackgroundColor
border.color: UM.Theme.getColor("detail_background")
border.width: UM.Theme.getSize("thick_lining").width
}
@ -20,7 +25,7 @@ TabButton
contentItem: Label
{
text: parent.text
font: UM.Theme.getFont("medium")
font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text")
width: contentWidth
anchors.centerIn: parent