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

Use NotificationIcon and simplify code

Browse source 
CURA-6151
This commit is contained in:
Lipu Fei 2019-04-01 11:52:33 +02:00
parent 15f9844b85
commit 9ae8d2f88c
2 changed files with 12 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

32
plugins/Toolbox/resources/qml/ToolboxHeader.qml
View file

@ -1,9 +1,11 @@
// Copyright (c) 2018 Ultimaker B.V. // Copyright (c) 2018 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.2 import QtQuick 2.10
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import UM 1.1 as UM
import UM 1.4 as UM
import Cura 1.0 as Cura
Item Item
{ {
@ -66,37 +68,19 @@ Item
width: UM.Theme.getSize("toolbox_header_tab").width + marketplaceNotificationIcon.width - UM.Theme.getSize("default_margin").width width: UM.Theme.getSize("toolbox_header_tab").width + marketplaceNotificationIcon.width - UM.Theme.getSize("default_margin").width
} }
Rectangle Cura.NotificationIcon
{ {
id: marketplaceNotificationIcon id: marketplaceNotificationIcon
color: UM.Theme.getColor("notification_icon")
width: (installedTabButton.height / 3) | 0
height: width
radius: (0.5 * width) | 0
visible: CuraApplication.getPackageManager().packagesWithUpdate.length > 0 visible: CuraApplication.getPackageManager().packagesWithUpdate.length > 0
anchors.right: installedTabButton.right anchors.right: installedTabButton.right
anchors.verticalCenter: installedTabButton.verticalCenter anchors.verticalCenter: installedTabButton.verticalCenter
Label labelText:
{ {
id: marketplaceNotificationText const itemCount = CuraApplication.getPackageManager().packagesWithUpdate.length
anchors.centerIn: parent return itemCount > 9 ? "9+" : itemCount
anchors.fill: parent
text:
{
if(CuraApplication.getPackageManager().packagesWithUpdate.length > 9)
{
return "9+" // More than 2 characters don't fit.
}
return CuraApplication.getPackageManager().packagesWithUpdate.length
}
color: UM.Theme.getColor("primary_text")
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
font: UM.Theme.getFont("small")
} }
} }

25
resources/qml/MainWindow/MainWindowHeader.qml
View file

@ -118,13 +118,9 @@ Item
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
} }
Rectangle Cura.NotificationIcon
{ {
id: marketplaceNotificationIcon id: marketplaceNotificationIcon
color: UM.Theme.getColor("notification_icon")
width: (marketplaceButton.height / 1.5) | 0
height: width
radius: (0.5 * width) | 0
anchors anchors
{ {
top: parent.top top: parent.top
@ -134,23 +130,10 @@ Item
} }
visible: CuraApplication.getPackageManager().packagesWithUpdate.length > 0 visible: CuraApplication.getPackageManager().packagesWithUpdate.length > 0
Label labelText:
{ {
id: marketplaceNotificationText const itemCount = CuraApplication.getPackageManager().packagesWithUpdate.length
anchors.centerIn: parent return itemCount > 9 ? "9+" : itemCount
anchors.fill: parent
text:
{
if(CuraApplication.getPackageManager().packagesWithUpdate.length > 9)
{
return "9+" // More than 2 characters don't fit.
}
return CuraApplication.getPackageManager().packagesWithUpdate.length
}
color: UM.Theme.getColor("primary_text")
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
font: UM.Theme.getFont("small")
} }
} }
} }