3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Clean up the ToolboxProgressButton

Browse source
This commit is contained in:
Diego Prado Gesto 2019-05-07 09:31:56 +02:00
parent 5c3a608e1a
commit 3390cca2d9
2 changed files with 33 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,7 +35,7 @@ Column
// Don't allow installing while another download is running // Don't allow installing while another download is running
enabled: installed || (!(toolbox.isDownloading && toolbox.activePackage != model) && !loginRequired) enabled: installed || (!(toolbox.isDownloading && toolbox.activePackage != model) && !loginRequired)
opacity: enabled ? 1.0 : 0.5 opacity: enabled ? 1.0 : 0.5
visible: !updateButton.visible && !installed// Don't show when the update button is visible visible: !updateButton.visible && !installed // Don't show when the update button is visible
} }
Cura.SecondaryButton Cura.SecondaryButton

71
plugins/Toolbox/resources/qml/ToolboxProgressButton.qml
View file

@ -1,16 +1,16 @@
// Copyright (c) 2018 Ultimaker B.V. // Copyright (c) 2019 Ultimaker B.V.
// Toolbox is released under the terms of the LGPLv3 or higher. // Toolbox is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2 import QtQuick 2.10
import QtQuick.Controls 1.4 import QtQuick.Controls 2.3
import QtQuick.Controls.Styles 1.4
import UM 1.1 as UM import UM 1.1 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
Item Cura.PrimaryButton
{ {
id: base id: button
property var active: false property var active: false
property var complete: false property var complete: false
@ -25,43 +25,36 @@ Item
width: UM.Theme.getSize("toolbox_action_button").width width: UM.Theme.getSize("toolbox_action_button").width
height: UM.Theme.getSize("toolbox_action_button").height height: UM.Theme.getSize("toolbox_action_button").height
fixedWidthMode: true
Cura.PrimaryButton text:
{ {
id: button if (complete)
width: UM.Theme.getSize("toolbox_action_button").width
height: UM.Theme.getSize("toolbox_action_button").height
fixedWidthMode: true
text:
{ {
if (complete) return completeLabel
{
return completeLabel
}
else if (active)
{
return activeLabel
}
else
{
return readyLabel
}
} }
onClicked: else if (active)
{ {
if (complete) return activeLabel
{ }
completeAction() else
} {
else if (active) return readyLabel
{
activeAction()
}
else
{
readyAction()
}
} }
busy: active
} }
onClicked:
{
if (complete)
{
completeAction()
}
else if (active)
{
activeAction()
}
else
{
readyAction()
}
}
busy: active
} }