fix merge conflict

Contributes to: CURA-8587
This commit is contained in:
Jelle Spijker 2021-12-01 18:32:14 +01:00
parent c1cffa09fe
commit 327b434788
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
3 changed files with 6 additions and 2 deletions

View file

@ -7,7 +7,8 @@ from typing import Optional, TYPE_CHECKING
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
from UM.Qt.ListModel import ListModel from UM.Qt.ListModel import ListModel
from UM.TaskManagement.HttpRequestScope import JsonDecoratorScope # To request JSON responses from the API. from UM.TaskManagement.HttpRequestScope import JsonDecoratorScope # To request JSON responses from the API.
from UM.TaskManagement.HttpRequestManager import HttpRequestData # To request the package list from the API. from UM.TaskManagement.HttpRequestManager import HttpRequestData # To request the package list from the API
from UM.Logger import Logger
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope # To make requests to the Ultimaker API with correct authorization. from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope # To make requests to the Ultimaker API with correct authorization.

View file

@ -17,6 +17,8 @@ RowLayout
property string busySecondaryText: busyMessageText.text property string busySecondaryText: busyMessageText.text
property string mainState: "primary" property string mainState: "primary"
signal clicked
state: mainState state: mainState
Cura.PrimaryButton Cura.PrimaryButton
@ -26,6 +28,7 @@ RowLayout
onClicked: onClicked:
{ {
manageButton.clicked()
manageButton.state = "busy" manageButton.state = "busy"
} }
} }
@ -37,6 +40,7 @@ RowLayout
onClicked: onClicked:
{ {
manageButton.clicked()
manageButton.state = "busy" manageButton.state = "busy"
} }
} }

View file

@ -38,7 +38,6 @@ ListView
text: section text: section
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
onTextChanged: print(text)
} }
} }