GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 03:09:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Add new button to open the Marketplace""

Browse Source 
This reverts commit aa4b7ddb8bce12c4ff2ea8864c1dad63a7a0a7c4.
Apparently it is now in scope again for the button to be there. It's in the requirements and the requirements are holy. Whoopteedoo.

Contributes to issue CURA-8556.
This commit is contained in:
Ghostkeeper 2021-10-25 00:51:26 +02:00
parent 1ab677f5dd
commit 7796abd55b
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
resources/qml/MainWindow/MainWindowHeader.qml
View File

@ -86,7 +86,6 @@ Item
// Shortcut button to quick access the Toolbox // Shortcut button to quick access the Toolbox
Controls2.Button Controls2.Button
{ {
id: marketplaceButton
text: catalog.i18nc("@action:button", "Marketplace") text: catalog.i18nc("@action:button", "Marketplace")
height: Math.round(0.5 * UM.Theme.getSize("main_window_header").height) height: Math.round(0.5 * UM.Theme.getSize("main_window_header").height)
onClicked: Cura.Actions.browsePackages.trigger() onClicked: Cura.Actions.browsePackages.trigger()
@ -107,7 +106,7 @@ Item
anchors.fill: parent anchors.fill: parent
radius: parent.radius radius: parent.radius
color: UM.Theme.getColor("primary_text") color: UM.Theme.getColor("primary_text")
opacity: marketplaceButton.hovered ? 0.2 : 0 opacity: parent.hovered ? 0.2 : 0
Behavior on opacity { NumberAnimation { duration: 100 } } Behavior on opacity { NumberAnimation { duration: 100 } }
} }
} }
@ -115,7 +114,7 @@ Item
contentItem: Label contentItem: Label
{ {
id: label id: label
text: marketplaceButton.text text: parent.text
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("primary_text") color: UM.Theme.getColor("primary_text")
width: contentWidth width: contentWidth
@ -125,7 +124,7 @@ Item
anchors anchors
{ {
right: applicationSwitcher.left right: marketplaceButton.left
rightMargin: UM.Theme.getSize("default_margin").width rightMargin: UM.Theme.getSize("default_margin").width
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
} }
@ -150,6 +149,37 @@ Item
} }
} }
Controls2.Button
{
id: marketplaceButton
width: Math.round(0.5 * UM.Theme.getSize("main_window_header").height)
height: width
anchors
{
verticalCenter: parent.verticalCenter
right: applicationSwitcher.left
rightMargin: UM.Theme.getSize("default_margin").width
}
background: UM.RecolorImage
{
anchors.fill: parent
color: UM.Theme.getColor("primary_text")
source: UM.Theme.getIcon("Shop")
Rectangle
{
anchors.fill: parent
radius: UM.Theme.getSize("action_button_radius").width
color: UM.Theme.getColor("primary_text")
opacity: marketplaceButton.hovered ? 0.2 : 0
Behavior on opacity { NumberAnimation { duration: 100; } }
}
}
onClicked: Cura.Actions.browsePackages.trigger()
}
ApplicationSwitcher ApplicationSwitcher
{ {
id: applicationSwitcher id: applicationSwitcher