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

Merge branch '4.0' into CURA-6005_cura_drive_plugin

Browse source 
Remove unused file.

Contributes to CURA-6005.
This commit is contained in:
Diego Prado Gesto 2018-12-18 07:17:37 +01:00
commit 3c99b69724
66 changed files with 786 additions and 2383 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/Toolbox/plugin.json
View file

@ -1,7 +1,7 @@
{
"name": "Toolbox",
"author": "Ultimaker B.V.",
"version": "1.0.0",
"api": 5,
"version": "1.0.1",
"api": "6.0",
"description": "Find, manage and install new Cura packages."
}

2
plugins/Toolbox/resources/qml/RatingWidget.qml
View file

@ -75,6 +75,8 @@ Item
background: UM.RecolorImage
{
source: UM.Theme.getIcon(control.isStarFilled ? "star_filled" : "star_empty")
sourceSize.width: width
sourceSize.height: height
// Unfilled stars should always have the default color. Only filled stars should change on hover
color:

2
plugins/Toolbox/resources/qml/SmallRatingWidget.qml
View file

@ -17,6 +17,8 @@ Row
color: model.user_rating == 0 ? UM.Theme.getColor("rating_star") : UM.Theme.getColor("primary")
height: UM.Theme.getSize("rating_star").height
width: UM.Theme.getSize("rating_star").width
sourceSize.height: height
sourceSize.width: width
}
Label

2
plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
View file

@ -88,7 +88,7 @@ Item
height: childrenRect.height
Label
{
text: catalog.i18nc("@label", "Rating") + ":"
text: catalog.i18nc("@label", "Your rating") + ":"
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text_medium")
renderType: Text.NativeRendering

1
plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml
View file

@ -47,6 +47,7 @@ Rectangle
height: UM.Theme.getSize("toolbox_heading_label").height
width: parent.width - UM.Theme.getSize("default_margin").width
wrapMode: Text.WordWrap
elide: Text.ElideRight
font: UM.Theme.getFont("medium_bold")
}
UM.RecolorImage