mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-16 11:17:49 -06:00
fix merge conflict
Contributes to: CURA-8587
This commit is contained in:
parent
c1cffa09fe
commit
327b434788
3 changed files with 6 additions and 2 deletions
|
@ -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.
|
||||||
|
|
|
@ -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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue