mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-07 22:13:58 -06:00
Merge remote-tracking branch 'origin/master' into CURA-7290_manual_account_sync
# Conflicts: # cura/API/Account.py
This commit is contained in:
Nino van Hooff
commit
b40b8e8489
1938 changed files with 5246 additions and 2008 deletions
192
resources/qml/WelcomePages/AddCloudPrintersView.qml
Normal file
192
resources/qml/WelcomePages/AddCloudPrintersView.qml
Normal file
|
|
@ -0,0 +1,192 @@
|
|||
// Copyright (c) 2019 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.10
|
||||
import QtQuick.Controls 2.3
|
||||
import QtQuick.Layouts 1.3
|
||||
|
||||
import UM 1.3 as UM
|
||||
import Cura 1.7 as Cura
|
||||
|
||||
|
||||
//
|
||||
// This component gets activated when the user presses the "Add cloud printers" button from the "Add a Printer" page.
|
||||
// It contains a busy indicator that remains active until the user logs in and adds a cloud printer in his/her account.
|
||||
// Once a cloud printer is added in mycloud.ultimaker.com, Cura discovers it (in a time window of 30 sec) and displays
|
||||
// the newly added printers in this page.
|
||||
//
|
||||
Item
|
||||
{
|
||||
UM.I18nCatalog { id: catalog; name: "cura" }
|
||||
|
||||
property bool searchingForCloudPrinters: true
|
||||
property var discoveredCloudPrintersModel: CuraApplication.getDiscoveredCloudPrintersModel()
|
||||
|
||||
// The area where either the discoveredCloudPrintersScrollView or the busyIndicator will be displayed
|
||||
Rectangle
|
||||
{
|
||||
id: cloudPrintersContent
|
||||
width: parent.width
|
||||
height: parent.height
|
||||
anchors
|
||||
{
|
||||
top: parent.top
|
||||
left: parent.left
|
||||
leftMargin: UM.Theme.getSize("default_margin").width
|
||||
right: parent.right
|
||||
bottom: finishButton.top
|
||||
bottomMargin: UM.Theme.getSize("default_margin").height
|
||||
}
|
||||
|
||||
Label
|
||||
{
|
||||
id: titleLabel
|
||||
anchors.top: parent.top
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
text: catalog.i18nc("@label", "Add a Cloud printer")
|
||||
color: UM.Theme.getColor("primary_button")
|
||||
font: UM.Theme.getFont("huge")
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
|
||||
// Component that contains a busy indicator and a message, while it waits for Cura to discover a cloud printer
|
||||
Rectangle
|
||||
{
|
||||
id: waitingContent
|
||||
width: parent.width
|
||||
height: waitingIndicator.height + waitingLabel.height
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
BusyIndicator
|
||||
{
|
||||
id: waitingIndicator
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
running: searchingForCloudPrinters
|
||||
}
|
||||
Label
|
||||
{
|
||||
id: waitingLabel
|
||||
anchors.top: waitingIndicator.bottom
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
text: catalog.i18nc("@label", "Waiting for Cloud response")
|
||||
font: UM.Theme.getFont("large")
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
visible: discoveredCloudPrintersModel.count == 0
|
||||
}
|
||||
|
||||
// Label displayed when a new cloud printer is discovered
|
||||
Label
|
||||
{
|
||||
anchors.top: titleLabel.bottom
|
||||
anchors.topMargin: 2 * UM.Theme.getSize("default_margin").height
|
||||
id: cloudPrintersAddedTitle
|
||||
font: UM.Theme.getFont("medium")
|
||||
text: catalog.i18nc("@label", "The following printers in your account have been added in Cura:")
|
||||
height: contentHeight + 2 * UM.Theme.getSize("default_margin").height
|
||||
visible: discoveredCloudPrintersModel.count > 0
|
||||
}
|
||||
|
||||
// The scrollView that contains the list of newly discovered Ultimaker Cloud printers. Visible only when
|
||||
// there is at least a new cloud printer.
|
||||
ScrollView
|
||||
{
|
||||
id: discoveredCloudPrintersScrollView
|
||||
width: parent.width
|
||||
clip : true
|
||||
ScrollBar.horizontal.policy: ScrollBar.AsNeeded
|
||||
ScrollBar.vertical.policy: ScrollBar.AsNeeded
|
||||
visible: discoveredCloudPrintersModel.count > 0
|
||||
anchors
|
||||
{
|
||||
top: cloudPrintersAddedTitle.bottom
|
||||
topMargin: UM.Theme.getSize("default_margin").height
|
||||
left: parent.left
|
||||
leftMargin: UM.Theme.getSize("default_margin").width
|
||||
right: parent.right
|
||||
bottom: parent.bottom
|
||||
}
|
||||
|
||||
Column
|
||||
{
|
||||
id: discoveredPrintersColumn
|
||||
spacing: 2 * UM.Theme.getSize("default_margin").height
|
||||
|
||||
Repeater
|
||||
{
|
||||
id: discoveredCloudPrintersRepeater
|
||||
model: discoveredCloudPrintersModel
|
||||
delegate: Item
|
||||
{
|
||||
width: discoveredCloudPrintersScrollView.width
|
||||
height: contentColumn.height
|
||||
|
||||
Column
|
||||
{
|
||||
id: contentColumn
|
||||
Label
|
||||
{
|
||||
id: cloudPrinterNameLabel
|
||||
leftPadding: UM.Theme.getSize("default_margin").width
|
||||
text: model.name
|
||||
font: UM.Theme.getFont("large_bold")
|
||||
color: UM.Theme.getColor("text")
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
Label
|
||||
{
|
||||
id: cloudPrinterTypeLabel
|
||||
leftPadding: 2 * UM.Theme.getSize("default_margin").width
|
||||
topPadding: UM.Theme.getSize("thin_margin").height
|
||||
text: {"Type: " + model.machine_type}
|
||||
font: UM.Theme.getFont("medium")
|
||||
color: UM.Theme.getColor("text")
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
Label
|
||||
{
|
||||
id: cloudPrinterFirmwareVersionLabel
|
||||
leftPadding: 2 * UM.Theme.getSize("default_margin").width
|
||||
text: {"Firmware version: " + model.firmware_version}
|
||||
font: UM.Theme.getFont("medium")
|
||||
color: UM.Theme.getColor("text")
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Cura.SecondaryButton
|
||||
{
|
||||
id: backButton
|
||||
anchors.left: parent.left
|
||||
anchors.bottom: parent.bottom
|
||||
text: catalog.i18nc("@button", "Add printer manually")
|
||||
onClicked:
|
||||
{
|
||||
discoveredCloudPrintersModel.clear()
|
||||
base.showPreviousPage()
|
||||
}
|
||||
visible: discoveredCloudPrintersModel.count == 0
|
||||
}
|
||||
|
||||
Cura.PrimaryButton
|
||||
{
|
||||
id: finishButton
|
||||
anchors.right: parent.right
|
||||
anchors.bottom: parent.bottom
|
||||
text: catalog.i18nc("@button", "Finish")
|
||||
onClicked:
|
||||
{
|
||||
discoveredCloudPrintersModel.clear()
|
||||
base.showNextPage()
|
||||
}
|
||||
|
||||
enabled: !waitingContent.visible
|
||||
}
|
||||
}
|
||||
|
|
@ -65,6 +65,20 @@ Item
|
|||
{
|
||||
base.goToPage("add_printer_by_ip")
|
||||
}
|
||||
|
||||
onAddCloudPrinterButtonClicked:
|
||||
{
|
||||
base.goToPage("add_cloud_printers")
|
||||
if (!Cura.API.account.isLoggedIn)
|
||||
{
|
||||
Cura.API.account.login()
|
||||
}
|
||||
else
|
||||
{
|
||||
Qt.openUrlExternally("https://mycloud.ultimaker.com/app/manage/printers")
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ Item
|
|||
|
||||
signal refreshButtonClicked()
|
||||
signal addByIpButtonClicked()
|
||||
signal addCloudPrinterButtonClicked()
|
||||
|
||||
Item
|
||||
{
|
||||
|
|
@ -193,6 +194,20 @@ Item
|
|||
onClicked: base.addByIpButtonClicked()
|
||||
}
|
||||
|
||||
Cura.SecondaryButton
|
||||
{
|
||||
id: addCloudPrinterButton
|
||||
anchors.left: addPrinterByIpButton.right
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
text: catalog.i18nc("@label", "Add cloud printer")
|
||||
height: UM.Theme.getSize("message_action_button").height
|
||||
onClicked: {
|
||||
CuraApplication.getDiscoveredCloudPrintersModel().clear()
|
||||
base.addCloudPrinterButtonClicked()
|
||||
}
|
||||
}
|
||||
|
||||
Item
|
||||
{
|
||||
id: troubleshootingButton
|
||||
|
|
|
|||
|
|
@ -15,17 +15,18 @@ Item
|
|||
{
|
||||
UM.I18nCatalog { id: catalog; name: "cura" }
|
||||
|
||||
property bool newCloudPrintersDetected: Cura.API.account.newCloudPrintersDetected
|
||||
signal cloudPrintersDetected(bool newCloudPrintersDetected)
|
||||
|
||||
Component.onCompleted: Cura.API.account.cloudPrintersDetectedChanged.connect(cloudPrintersDetected)
|
||||
Component.onCompleted: CuraApplication.getDiscoveredCloudPrintersModel().cloudPrintersDetectedChanged.connect(cloudPrintersDetected)
|
||||
|
||||
onCloudPrintersDetected:
|
||||
{
|
||||
// When the user signs in successfully, it will be checked whether he/she has cloud printers connected to
|
||||
// the account. If he/she does, then the welcome wizard can close. If not, then proceed to the next page (if any)
|
||||
// the account. If he/she does, then the welcome wizard will show a summary of the Cloud printers linked to the
|
||||
// account. If there are no cloud printers, then proceed to the next page (if any)
|
||||
if(newCloudPrintersDetected)
|
||||
{
|
||||
base.endWizard()
|
||||
base.goToPage("add_cloud_printers")
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ Item
|
|||
|
||||
anchors.centerIn: parent
|
||||
|
||||
width: 580 * screenScaleFactor
|
||||
height: 600 * screenScaleFactor
|
||||
width: UM.Theme.getSize("welcome_wizard_window").width
|
||||
height: UM.Theme.getSize("welcome_wizard_window").height
|
||||
|
||||
property int shadowOffset: 1 * screenScaleFactor
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue