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

Added a 'Marketplace' icon in the header of the Toolbox

Browse source 
CURA-7071
This commit is contained in:
Dimitriovski 2020-01-16 16:30:11 +01:00
parent ab6effb712
commit 51ec8a539f
No known key found for this signature in database
GPG key ID: 4E62757E2B0D304D
3 changed files with 46 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/ApplicationMetadata.py
View file

@ -1,4 +1,4 @@
# Copyright (c) 2018 Ultimaker B.V.
# Copyright (c) 2020 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
# ---------
@ -56,3 +56,5 @@ try:
except ImportError:
CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME
WEB_MARKETPLACE_URL = "https://marketplace.ultimaker.com/app/cura/materials"

44
plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
View file

@ -51,7 +51,6 @@ Item
toolbox.viewPage = "overview"
}
}
}
ToolboxTabButton
{
@ -59,24 +58,18 @@ Item
text: catalog.i18nc("@title:tab", "Installed")
active: toolbox.viewCategory == "installed"
enabled: !toolbox.isDownloading
anchors
{
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
}
onClicked: toolbox.viewCategory = "installed"
width: UM.Theme.getSize("toolbox_header_tab").width + marketplaceNotificationIcon.width - UM.Theme.getSize("default_margin").width
}
}
Cura.NotificationIcon
{
id: marketplaceNotificationIcon
visible: CuraApplication.getPackageManager().packagesWithUpdate.length > 0
anchors.right: installedTabButton.right
anchors.verticalCenter: installedTabButton.verticalCenter
anchors.right: bar.right
labelText:
{
const itemCount = CuraApplication.getPackageManager().packagesWithUpdate.length
@ -84,6 +77,35 @@ Item
}
}
UM.TooltipArea
{
width: childrenRect.width;
height: childrenRect.height;
text: catalog.i18nc("@info:tooltip", "Go to Web Marketplace")
anchors
{
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
verticalCenter: parent.verticalCenter
}
Image
{
id: cloudMarketplaceButton
source: "../../images/marketplace.png"
height: 45
width: height
//width: UM.Theme.getSize("toolbox_header_tab").width
mipmap: true
fillMode: Image.PreserveAspectFit
MouseArea
{
anchors.fill: parent
onClicked: Qt.openUrlExternally(toolbox.getWebMarketplaceUrl)
}
}
}
ToolboxShadow
{
anchors.top: bar.bottom

4
plugins/Toolbox/src/Toolbox.py
View file

@ -765,6 +765,10 @@ class Toolbox(QObject, Extension):
def materialsGenericModel(self) -> PackagesModel:
return self._materials_generic_model
@pyqtProperty(str, constant=True)
def getWebMarketplaceUrl(self) -> str:
return ApplicationMetadata.WEB_MARKETPLACE_URL
# Filter Models:
# --------------------------------------------------------------------------
@pyqtSlot(str, str, str)