GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 07:44:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Also add the login required label at the installed plugin list

Browse Source 
CURA-6006
This commit is contained in:
Jaime van Kessel 2018-12-06 17:35:58 +01:00
parent 2c9c9d8c96
commit d4a255c9e5
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/Toolbox/resources/qml/ToolboxDetailTileActions.qml
View File

@ -36,7 +36,6 @@ Column
visible: !updateButton.visible // Don't show when the update button is visible visible: !updateButton.visible // Don't show when the update button is visible
} }
Label Label
{ {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap

21
plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml
View File

@ -6,12 +6,13 @@ 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
import Cura 1.0 as Cura import Cura 1.1 as Cura
Column Column
{ {
property bool canUpdate: false property bool canUpdate: false
property bool canDowngrade: false property bool canDowngrade: false
property bool loginRequired: model.login_required && !Cura.API.account.isLoggedIn
width: UM.Theme.getSize("toolbox_action_button").width width: UM.Theme.getSize("toolbox_action_button").width
spacing: UM.Theme.getSize("narrow_margin").height spacing: UM.Theme.getSize("narrow_margin").height
@ -40,11 +41,27 @@ Column
onActiveAction: toolbox.cancelDownload() onActiveAction: toolbox.cancelDownload()
// Don't allow installing while another download is running // Don't allow installing while another download is running
enabled: !(toolbox.isDownloading && toolbox.activePackage != model) enabled: !(toolbox.isDownloading && toolbox.activePackage != model) && !loginRequired
opacity: enabled ? 1.0 : 0.5 opacity: enabled ? 1.0 : 0.5
visible: canUpdate visible: canUpdate
} }
Label
{
wrapMode: Text.WordWrap
text: catalog.i18nc("@label:The string between <a href=> and </a> is the highlighted link", "<a href='%1'>Log in</a> is required to update")
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
linkColor: UM.Theme.getColor("text_link")
visible: loginRequired
width: updateButton.width
MouseArea
{
anchors.fill: parent
onClicked: Cura.API.account.login()
}
}
Cura.SecondaryButton Cura.SecondaryButton
{ {
id: removeButton id: removeButton