GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 20:19:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.7' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2020-08-04 13:31:17 +02:00
commit a8904e76b0
No known key found for this signature in database
GPG Key ID: 3710727397403C91
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
View File

@ -291,7 +291,6 @@ class CloudOutputDeviceManager:
del self._remote_clusters[old_cluster_id] del self._remote_clusters[old_cluster_id]
self._remote_clusters[new_cloud_output_device.key] = new_cloud_output_device self._remote_clusters[new_cloud_output_device.key] = new_cloud_output_device
def _devicesRemovedFromAccount(self, removed_device_ids: Set[str]) -> None: def _devicesRemovedFromAccount(self, removed_device_ids: Set[str]) -> None:
""" """
Removes the CloudOutputDevice from the received device ids and marks the specific printers as "removed from Removes the CloudOutputDevice from the received device ids and marks the specific printers as "removed from

4
resources/qml/Account/SyncState.qml
View File

@ -94,7 +94,7 @@ Row // Sync state icon + message
{ {
id: updatePackagesButton id: updatePackagesButton
text: catalog.i18nc("@button", "Install pending updates") text: catalog.i18nc("@button", "Install pending updates")
color: UM.Theme.getColor("secondary_button_text") color: UM.Theme.getColor("text_link")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
@ -116,7 +116,7 @@ Row // Sync state icon + message
{ {
id: accountSyncButton id: accountSyncButton
text: catalog.i18nc("@button", "Check for account updates") text: catalog.i18nc("@button", "Check for account updates")
color: UM.Theme.getColor("secondary_button_text") color: UM.Theme.getColor("text_link")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter

2
resources/qml/TertiaryButton.qml
View File

@ -12,7 +12,7 @@ Cura.ActionButton
shadowEnabled: true shadowEnabled: true
shadowColor: enabled ? UM.Theme.getColor("secondary_button_shadow"): UM.Theme.getColor("action_button_disabled_shadow") shadowColor: enabled ? UM.Theme.getColor("secondary_button_shadow"): UM.Theme.getColor("action_button_disabled_shadow")
color: "transparent" color: "transparent"
textColor: UM.Theme.getColor("secondary_button_text") textColor: UM.Theme.getColor("text_link")
outlineColor: "transparent" outlineColor: "transparent"
disabledColor: UM.Theme.getColor("action_button_disabled") disabledColor: UM.Theme.getColor("action_button_disabled")
textDisabledColor: UM.Theme.getColor("action_button_disabled_text") textDisabledColor: UM.Theme.getColor("action_button_disabled_text")