3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Jaime van Kessel 2020-04-02 14:34:17 +02:00
commit 8ba71fde44
No known key found for this signature in database
GPG key ID: 3710727397403C91
3 changed files with 132 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/Toolbox/resources/qml/components/ToolboxInstalledTile.qml
View file

@ -17,7 +17,8 @@ Item
color: UM.Theme.getColor("lining")
width: parent.width
height: Math.floor(UM.Theme.getSize("default_lining").height)
anchors.bottom: parent.bottom
anchors.bottom: parent.top
visible: index != 0
}
Row
{
@ -48,6 +49,8 @@ Item
{
text: model.name
width: parent.width
maximumLineCount: 1
elide: Text.ElideRight
wrapMode: Text.WordWrap
font: UM.Theme.getFont("large_bold")
color: pluginInfo.color

119
plugins/Toolbox/resources/qml/pages/ToolboxInstalledPage.qml
View file

@ -20,7 +20,6 @@ ScrollView
width: page.width
spacing: UM.Theme.getSize("default_margin").height
padding: UM.Theme.getSize("wide_margin").width
visible: toolbox.pluginsInstalledModel.items.length > 0
height: childrenRect.height + 2 * UM.Theme.getSize("wide_margin").height
Label
@ -31,9 +30,9 @@ ScrollView
right: parent.right
margins: parent.padding
}
text: catalog.i18nc("@title:tab", "Plugins")
text: catalog.i18nc("@title:tab", "Installed plugins")
color: UM.Theme.getColor("text_medium")
font: UM.Theme.getFont("large")
font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering
}
@ -61,11 +60,19 @@ ScrollView
}
Repeater
{
id: materialList
id: pluginList
model: toolbox.pluginsInstalledModel
delegate: ToolboxInstalledTile {}
delegate: ToolboxInstalledTile { }
}
}
Label
{
visible: toolbox.pluginsInstalledModel.count < 1
padding: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@info", "No plugin has been installed.")
font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering
}
}
Label
@ -76,7 +83,7 @@ ScrollView
right: parent.right
margins: parent.padding
}
text: catalog.i18nc("@title:tab", "Materials")
text: catalog.i18nc("@title:tab", "Installed materials")
color: UM.Theme.getColor("text_medium")
font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering
@ -106,8 +113,106 @@ ScrollView
}
Repeater
{
id: pluginList
id: installedMaterialsList
model: toolbox.materialsInstalledModel
delegate: ToolboxInstalledTile { }
}
}
Label
{
visible: toolbox.materialsInstalledModel.count < 1
padding: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@info", "No material has been installed.")
font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering
}
}
Label
{
anchors
{
left: parent.left
right: parent.right
margins: parent.padding
}
text: catalog.i18nc("@title:tab", "Bundled plugins")
color: UM.Theme.getColor("text_medium")
font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering
}
Rectangle
{
anchors
{
left: parent.left
right: parent.right
margins: parent.padding
}
id: bundledPlugins
color: "transparent"
height: childrenRect.height + UM.Theme.getSize("default_margin").width
border.color: UM.Theme.getColor("lining")
border.width: UM.Theme.getSize("default_lining").width
Column
{
anchors
{
top: parent.top
right: parent.right
left: parent.left
margins: UM.Theme.getSize("default_margin").width
}
Repeater
{
id: bundledPluginsList
model: toolbox.pluginsBundledModel
delegate: ToolboxInstalledTile { }
}
}
}
Label
{
anchors
{
left: parent.left
right: parent.right
margins: parent.padding
}
text: catalog.i18nc("@title:tab", "Bundled materials")
color: UM.Theme.getColor("text_medium")
font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering
}
Rectangle
{
anchors
{
left: parent.left
right: parent.right
margins: parent.padding
}
id: bundledMaterials
color: "transparent"
height: childrenRect.height + UM.Theme.getSize("default_margin").width
border.color: UM.Theme.getColor("lining")
border.width: UM.Theme.getSize("default_lining").width
Column
{
anchors
{
top: parent.top
right: parent.right
left: parent.left
margins: UM.Theme.getSize("default_margin").width
}
Repeater
{
id: bundledMaterialsList
model: toolbox.materialsBundledModel
delegate: ToolboxInstalledTile {}
}
}