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

CURA-5035 Fixed selection header

Browse source
This commit is contained in:
Ian Paschal 2018-04-24 16:59:23 +02:00
parent f2301eec31
commit 236e2db47e
14 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,7 @@ import UM 1.1 as UM
Window Window
{ {
id: base id: base
property var selection: null
title: catalog.i18nc("@title", "Toolbox") title: catalog.i18nc("@title", "Toolbox")
modality: Qt.ApplicationModal modality: Qt.ApplicationModal
width: 720 * screenScaleFactor width: 720 * screenScaleFactor

8
plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml
View file

@ -8,8 +8,8 @@ import UM 1.1 as UM
Item Item
{ {
id: base id: page
property var details: toolbox.viewSelection property var details: base.selection
anchors.fill: parent anchors.fill: parent
ToolboxBackColumn ToolboxBackColumn
{ {
@ -130,9 +130,9 @@ Item
anchors anchors
{ {
top: header.bottom top: header.bottom
bottom: base.bottom bottom: page.bottom
left: header.left left: header.left
right: base.right right: page.right
} }
} }
} }

9
plugins/Toolbox/resources/qml/ToolboxDetailList.qml
View file

@ -6,19 +6,20 @@ import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import UM 1.1 as UM import UM 1.1 as UM
Item Rectangle
{ {
id: base id: detailList
// color: "green"
ScrollView ScrollView
{ {
frameVisible: false frameVisible: false
anchors.fill: base anchors.fill: detailList
style: UM.Theme.styles.scrollview style: UM.Theme.styles.scrollview
Column Column
{ {
anchors anchors
{ {
right: base.right right: detailList.right
topMargin: UM.Theme.getSize("wide_margin").height topMargin: UM.Theme.getSize("wide_margin").height
bottomMargin: UM.Theme.getSize("wide_margin").height bottomMargin: UM.Theme.getSize("wide_margin").height
top: parent.top top: parent.top

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

@ -8,8 +8,8 @@ import UM 1.1 as UM
Item Item
{ {
id: base id: page
property var details: toolbox.viewSelection property var details: base.selection
anchors.fill: parent anchors.fill: parent
width: parent.width width: parent.width
ToolboxBackColumn ToolboxBackColumn
@ -149,9 +149,9 @@ Item
anchors anchors
{ {
top: header.bottom top: header.bottom
bottom: base.bottom bottom: page.bottom
left: header.left left: header.left
right: base.right right: page.right
} }
} }
} }

12
plugins/Toolbox/resources/qml/ToolboxDetailTile.qml
View file

@ -8,8 +8,9 @@ import UM 1.1 as UM
Item Item
{ {
id: tile
property bool installed: toolbox.isInstalled(model.id) property bool installed: toolbox.isInstalled(model.id)
width: base.width - UM.Theme.getSize("wide_margin").width width: detailList.width - UM.Theme.getSize("wide_margin").width
height: UM.Theme.getSize("toolbox_detail_tile").height height: UM.Theme.getSize("toolbox_detail_tile").height
Column Column
{ {
@ -55,9 +56,10 @@ Item
Rectangle Rectangle
{ {
id: controls id: controls
anchors.right: parent.right anchors.right: tile.right
anchors.top: parent.top anchors.top: tile.top
width: childrenRect.width width: childrenRect.width
color: "blue"
Button Button
{ {
id: installButton id: installButton
@ -180,9 +182,9 @@ Item
Rectangle Rectangle
{ {
color: UM.Theme.getColor("lining") color: UM.Theme.getColor("lining")
width: parent.width width: tile.width
height: UM.Theme.getSize("default_lining").height height: UM.Theme.getSize("default_lining").height
anchors.bottom: parent.bottom anchors.bottom: tile.bottom
} }
Connections Connections
{ {

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

@ -11,7 +11,6 @@ import UM 1.1 as UM
Column Column
{ {
id: base
height: childrenRect.height height: childrenRect.height
width: parent.width width: parent.width
spacing: UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("default_margin").height

3
plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml
View file

@ -9,7 +9,6 @@ import UM 1.1 as UM
Item Item
{ {
id: base
height: childrenRect.height height: childrenRect.height
Layout.alignment: Qt.AlignTop | Qt.AlignLeft Layout.alignment: Qt.AlignTop | Qt.AlignLeft
Rectangle Rectangle
@ -88,7 +87,7 @@ Item
} }
onClicked: onClicked:
{ {
toolbox.viewSelection = model base.selection = model
switch(toolbox.viewCategory) switch(toolbox.viewCategory)
{ {
case "material": case "material":

4
plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
View file

@ -8,14 +8,14 @@ import UM 1.1 as UM
ScrollView ScrollView
{ {
id: base id: page
frameVisible: false frameVisible: false
width: parent.width width: parent.width
height: parent.height height: parent.height
style: UM.Theme.styles.scrollview style: UM.Theme.styles.scrollview
Column Column
{ {
width: base.width width: page.width
spacing: UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("default_margin").height
padding: UM.Theme.getSize("wide_margin").height padding: UM.Theme.getSize("wide_margin").height
height: childrenRect.height + 2 * padding height: childrenRect.height + 2 * padding

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

@ -8,7 +8,6 @@ import UM 1.1 as UM
Column Column
{ {
id: base
height: childrenRect.height height: childrenRect.height
spacing: UM.Theme.getSize("toolbox_showcase_spacing").width spacing: UM.Theme.getSize("toolbox_showcase_spacing").width
width: parent.width width: parent.width

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

@ -64,7 +64,7 @@ Item
anchors.fill: parent anchors.fill: parent
onClicked: onClicked:
{ {
toolbox.viewSelection = model base.selection = model
switch(toolbox.viewCategory) switch(toolbox.viewCategory)
{ {
case "material": case "material":

4
plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
View file

@ -10,7 +10,7 @@ import UM 1.1 as UM
ScrollView ScrollView
{ {
id: base id: page
frameVisible: false frameVisible: false
width: parent.width width: parent.width
height: parent.height height: parent.height
@ -68,7 +68,7 @@ ScrollView
Label Label
{ {
visible: toolbox.materialsInstalledModel.items.length > 0 visible: toolbox.materialsInstalledModel.items.length > 0
width: base.width width: page.width
text: catalog.i18nc("@title:tab", "Materials") text: catalog.i18nc("@title:tab", "Materials")
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")

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

@ -8,7 +8,6 @@ import UM 1.1 as UM
Item Item
{ {
id: base
property bool canUpdate: false property bool canUpdate: false
property bool isEnabled: true property bool isEnabled: true
height: UM.Theme.getSize("toolbox_installed_tile").height height: UM.Theme.getSize("toolbox_installed_tile").height

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

@ -7,7 +7,7 @@ import QtQuick.Controls.Styles 1.4
Rectangle Rectangle
{ {
id: base id: page
width: parent.width width: parent.width
height: parent.height height: parent.height
color: "transparent" color: "transparent"

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

@ -447,7 +447,7 @@
"toolbox_thumbnail_small": [6.0, 6.0], "toolbox_thumbnail_small": [6.0, 6.0],
"toolbox_thumbnail_medium": [8.0, 8.0], "toolbox_thumbnail_medium": [8.0, 8.0],
"toolbox_thumbnail_large": [12.0, 12.0], "toolbox_thumbnail_large": [12.0, 12.0],
"toolbox_footer": [1.0, 5.5], "toolbox_footer": [1.0, 4.5],
"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],