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

CURA-5035 More styling & layout

Browse source
This commit is contained in:
Ian Paschal 2018-04-10 16:07:39 +02:00
parent 7359554641
commit d4cc4659d8
11 changed files with 248 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,6 @@ Rectangle
right: controls.left
rightMargin: UM.Theme.getSize("default_margin").width
top: parent.top
topMargin: UM.Theme.getSize("default_margin").height
}
Label
{
@ -45,7 +44,6 @@ Rectangle
id: controls
anchors.right: parent.right
anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("default_margin").height
width: childrenRect.width
Button {
id: installButton
@ -54,7 +52,7 @@ Rectangle
{
if ( manager.isDownloading )
{
return pluginList.activePlugin == model ? true : false
return manager.activePackage == model ? true : false
}
else
{
@ -79,19 +77,20 @@ Rectangle
}
onClicked:
{
if ( manager.isDownloading && pluginList.activePlugin == model )
console.log( "MODEL", model.download_url )
if ( manager.isDownloading && manager.activePackage == model )
{
manager.cancelDownload();
}
else
{
pluginList.activePlugin = model;
// manager.activePackage = model;
if ( model.can_upgrade )
{
manager.downloadAndInstallPlugin( model.update_url );
// manager.downloadAndInstallPlugin( model.update_url );
}
else {
manager.downloadAndInstallPlugin( model.file_location );
manager.startDownload( model.download_url );
}
}
}
@ -102,6 +101,6 @@ Rectangle
color: UM.Theme.getColor("text_medium")
width: parent.width
height: UM.Theme.getSize("default_lining").height
anchors.top: parent.top
anchors.bottom: parent.bottom
}
}