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

Merge branch 'feature_material_marketplace' into feature_cura_package_api

Browse source
This commit is contained in:
Diego Prado Gesto 2018-04-03 11:42:56 +02:00
commit 1ad34495b4
3 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,7 @@ Window
{
id: mainView
width: parent.width
color: "red"
anchors
{
top: topBar.bottom

0
plugins/Toolbox/resources/qml/ToolboxDetailBlock.qml → plugins/Toolbox/resources/qml/ToolboxDetailTile.qml
View file

27
plugins/Toolbox/resources/qml/ToolboxViewDetail.qml
View file

@ -7,11 +7,13 @@ import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import UM 1.1 as UM
// TODO: Switch to QtQuick.Controls 2.x and remove QtQuick.Controls.Styles
Item
{
id: base
anchors.fill: parent
Rectangle
Item
{
id: backMargin
height: parent.height
@ -31,7 +33,6 @@ Item
manager.setDetailView("")
}
}
color: "transparent"
}
ScrollView
{
@ -68,17 +69,17 @@ Item
border.width: 1
}
}
ToolboxDetailBlock {}
ToolboxDetailBlock {}
ToolboxDetailBlock {}
ToolboxDetailBlock {}
ToolboxDetailBlock {}
ToolboxDetailBlock {}
ToolboxDetailBlock {}
ToolboxDetailBlock {}
ToolboxDetailBlock {}
ToolboxDetailBlock {}
ToolboxDetailBlock {}
ToolboxDetailTile {}
ToolboxDetailTile {}
ToolboxDetailTile {}
ToolboxDetailTile {}
ToolboxDetailTile {}
ToolboxDetailTile {}
ToolboxDetailTile {}
ToolboxDetailTile {}
ToolboxDetailTile {}
ToolboxDetailTile {}
ToolboxDetailTile {}
}
}
}