From e5c2f5702cb84c8f805099cbe51f4445e4c4b3cc Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Thu, 21 Apr 2022 15:04:52 +0200 Subject: [PATCH 1/4] Subtract previously unused rightMargin from MachineSelectorButton width. CURA-9143 --- resources/qml/PrinterSelector/MachineSelectorButton.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrinterSelector/MachineSelectorButton.qml b/resources/qml/PrinterSelector/MachineSelectorButton.qml index 74c833f691..cd1f3cc574 100644 --- a/resources/qml/PrinterSelector/MachineSelectorButton.qml +++ b/resources/qml/PrinterSelector/MachineSelectorButton.qml @@ -40,7 +40,7 @@ Button contentItem: Item { - width: machineSelectorButton.width - machineSelectorButton.leftPadding + width: machineSelectorButton.width - machineSelectorButton.leftPadding - machineSelectorButton.rightPadding height: UM.Theme.getSize("action_button").height UM.Label From c29468002293cdc28ba22030d6553eba23bd4ff5 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Thu, 21 Apr 2022 15:52:15 +0200 Subject: [PATCH 2/4] Fix scrollbar filling space by replacing custom implementation with generic UM.ScrollBar CURA-9144 --- .../resources/qml/SelectProjectPage.qml | 26 ++----------------- .../Marketplace/resources/qml/Packages.qml | 23 +++------------- 2 files changed, 6 insertions(+), 43 deletions(-) diff --git a/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml b/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml index ed632124e5..60beb66e11 100644 --- a/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml +++ b/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml @@ -6,7 +6,7 @@ import QtQuick.Window 2.2 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.1 -import UM 1.2 as UM +import UM 1.6 as UM import Cura 1.7 as Cura import DigitalFactory 1.0 as DF @@ -148,29 +148,7 @@ Item contentHeight: projectsListView.implicitHeight anchors.fill: parent - ScrollBar.vertical: ScrollBar - { - // Vertical ScrollBar, styled similarly to the scrollBar in the settings panel - id: verticalScrollBar - visible: flickableView.contentHeight > flickableView.height - - background: Rectangle - { - implicitWidth: UM.Theme.getSize("scrollbar").width - radius: Math.round(implicitWidth / 2) - color: UM.Theme.getColor("scrollbar_background") - } - - contentItem: Rectangle - { - id: scrollViewHandle - implicitWidth: UM.Theme.getSize("scrollbar").width - radius: Math.round(implicitWidth / 2) - - color: verticalScrollBar.pressed ? UM.Theme.getColor("scrollbar_handle_down") : verticalScrollBar.hovered ? UM.Theme.getColor("scrollbar_handle_hover") : UM.Theme.getColor("scrollbar_handle") - Behavior on color { ColorAnimation { duration: 50; } } - } - } + ScrollBar.vertical: UM.ScrollBar { id: verticalScrollBar } Column { diff --git a/plugins/Marketplace/resources/qml/Packages.qml b/plugins/Marketplace/resources/qml/Packages.qml index d86536639c..74a18bccd3 100644 --- a/plugins/Marketplace/resources/qml/Packages.qml +++ b/plugins/Marketplace/resources/qml/Packages.qml @@ -1,9 +1,10 @@ -// Copyright (c) 2021 Ultimaker B.V. +// Copyright (c) 2022 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.15 import QtQuick.Controls 2.15 -import UM 1.4 as UM + +import UM 1.6 as UM ListView @@ -51,23 +52,7 @@ ListView } } - ScrollBar.vertical: ScrollBar - { - // Vertical ScrollBar, styled similarly to the scrollBar in the settings panel - id: verticalScrollBar - visible: packages.contentHeight > packages.height - anchors.right: parent.right - background: Item {} - - contentItem: Rectangle - { - id: scrollViewHandle - implicitWidth: UM.Theme.getSize("scrollbar").width - radius: Math.round(implicitWidth / 2) - color: verticalScrollBar.pressed ? UM.Theme.getColor("scrollbar_handle_down") : verticalScrollBar.hovered ? UM.Theme.getColor("scrollbar_handle_hover") : UM.Theme.getColor("scrollbar_handle") - Behavior on color { ColorAnimation { duration: 50; } } - } - } + ScrollBar.vertical: UM.ScrollBar { id: verticalScrollBar } delegate: MouseArea { From c1ed7b97f9e5083c2571d60d2e1a031ee48fd9ca Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 22 Apr 2022 09:36:46 +0200 Subject: [PATCH 3/4] Use right enums for single instance CURA-9183 --- cura/SingleInstance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/SingleInstance.py b/cura/SingleInstance.py index af98869ad7..61ab1204fe 100644 --- a/cura/SingleInstance.py +++ b/cura/SingleInstance.py @@ -29,7 +29,7 @@ class SingleInstance: single_instance_socket.connectToServer("ultimaker-cura") single_instance_socket.waitForConnected(msecs = 3000) # wait for 3 seconds - if single_instance_socket.state() != QLocalSocket.ConnectedState: + if single_instance_socket.state() != QLocalSocket.LocalSocketState.ConnectedState: return False # We only send the files that need to be opened. @@ -37,7 +37,7 @@ class SingleInstance: Logger.log("i", "No file need to be opened, do nothing.") return True - if single_instance_socket.state() == QLocalSocket.ConnectedState: + if single_instance_socket.state() == QLocalSocket.LocalSocketState.ConnectedState: Logger.log("i", "Connection has been made to the single-instance Cura socket.") # Protocol is one line of JSON terminated with a carriage return. From 86534e78a05ec5c61ec362d4a5b67083fc108b2d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 22 Apr 2022 11:00:45 +0200 Subject: [PATCH 4/4] Prevent error message when no further pages in marketplace could be loaded Contributes to #11858 --- plugins/Marketplace/RemotePackageList.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/Marketplace/RemotePackageList.py b/plugins/Marketplace/RemotePackageList.py index 67ba8c75da..c20efabbc2 100644 --- a/plugins/Marketplace/RemotePackageList.py +++ b/plugins/Marketplace/RemotePackageList.py @@ -138,9 +138,10 @@ class RemotePackageList(PackageList): :param reply: The reply with packages. This will most likely be incomplete and should be ignored. :param error: The error status of the request. """ - if error == QNetworkReply.NetworkError.OperationCanceledError: + if error == QNetworkReply.NetworkError.OperationCanceledError or error == QNetworkReply.NetworkError.ProtocolUnknownError: Logger.debug("Cancelled request for packages.") self._ongoing_requests["get_packages"] = None + self.setIsLoading(False) return # Don't show an error about this to the user. Logger.error("Could not reach Marketplace server.") self.setErrorMessage(catalog.i18nc("@info:error", "Could not reach Marketplace."))