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

Merge branch 'master' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Diego Prado Gesto 2018-07-04 14:32:05 +02:00
commit 3b406b5467
5 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml
View File

@ -9,17 +9,8 @@ import UM 1.1 as UM
Item Item
{ {
id: page id: page
property var details: base.selection || dummy_details property var details: base.selection || {}
anchors.fill: parent anchors.fill: parent
property var dummy_details: new Object({
name: "",
description: "",
email: "",
website: "",
icon_url: ""
})
ToolboxBackColumn ToolboxBackColumn
{ {
id: sidebar id: sidebar

16
plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
View File

@ -9,21 +9,9 @@ import UM 1.1 as UM
Item Item
{ {
id: page id: page
property var details: base.selection || dummy_details property var details: base.selection
anchors.fill: parent anchors.fill: parent
width: parent.width width: parent.width
property var dummy_details: new Object({
name: '',
version: '',
last_updated: '',
author_email: '',
author_name: '',
website: '',
icon_url: '',
download_count: ''
})
ToolboxBackColumn ToolboxBackColumn
{ {
id: sidebar id: sidebar
@ -86,6 +74,7 @@ Item
} }
spacing: Math.floor(UM.Theme.getSize("narrow_margin").height) spacing: Math.floor(UM.Theme.getSize("narrow_margin").height)
width: childrenRect.width width: childrenRect.width
height: childrenRect.height
Label Label
{ {
text: catalog.i18nc("@label", "Version") + ":" text: catalog.i18nc("@label", "Version") + ":"
@ -122,6 +111,7 @@ Item
topMargin: UM.Theme.getSize("default_margin").height topMargin: UM.Theme.getSize("default_margin").height
} }
spacing: Math.floor(UM.Theme.getSize("narrow_margin").height) spacing: Math.floor(UM.Theme.getSize("narrow_margin").height)
height: childrenRect.height
Label Label
{ {
text: details.version || catalog.i18nc("@label", "Unknown") text: details.version || catalog.i18nc("@label", "Unknown")

2
plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml
View File

@ -25,7 +25,7 @@ Column
{ {
id: grid id: grid
property var model: toolbox.viewCategory == "material" ? toolbox.authorsModel : toolbox.packagesModel property var model: toolbox.viewCategory == "material" ? toolbox.authorsModel : toolbox.packagesModel
width: parent.width width: parent.width - 2 * parent.padding
columns: 2 columns: 2
columnSpacing: UM.Theme.getSize("default_margin").height columnSpacing: UM.Theme.getSize("default_margin").height
rowSpacing: UM.Theme.getSize("default_margin").width rowSpacing: UM.Theme.getSize("default_margin").width

1
plugins/Toolbox/resources/qml/ToolboxFooter.qml
View File

@ -25,6 +25,7 @@ Item
right: restartButton.right right: restartButton.right
rightMargin: UM.Theme.getSize("default_margin").width rightMargin: UM.Theme.getSize("default_margin").width
} }
color: UM.Theme.getColor("text")
} }
Button Button
{ {

2
resources/themes/cura-light/theme.json
View File

@ -448,7 +448,7 @@
"toolbox_footer_button": [8.0, 2.5], "toolbox_footer_button": [8.0, 2.5],
"toolbox_showcase_spacing": [1.0, 1.0], "toolbox_showcase_spacing": [1.0, 1.0],
"toolbox_header_tab": [8.0, 4.0], "toolbox_header_tab": [8.0, 4.0],
"toolbox_detail_header": [1.0, 12.0], "toolbox_detail_header": [1.0, 14.0],
"toolbox_detail_tile": [1.0, 8.0], "toolbox_detail_tile": [1.0, 8.0],
"toolbox_back_column": [6.0, 1.0], "toolbox_back_column": [6.0, 1.0],
"toolbox_back_button": [4.0, 2.0], "toolbox_back_button": [4.0, 2.0],