From c5f4b302649aa66ef39fc4ce74759c654069a450 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 12 Apr 2019 13:01:39 +0200 Subject: [PATCH 1/3] Don't show 'discovered' machines that are placeholders. [CURA-6057] --- cura/Machines/Models/DiscoveredPrintersModel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/DiscoveredPrintersModel.py b/cura/Machines/Models/DiscoveredPrintersModel.py index aa372a49e8..7468b7cd8e 100644 --- a/cura/Machines/Models/DiscoveredPrintersModel.py +++ b/cura/Machines/Models/DiscoveredPrintersModel.py @@ -89,7 +89,8 @@ class DiscoveredPrintersModel(QObject): @pyqtProperty(list, notify = discoveredPrintersChanged) def discoveredPrinters(self) -> List["DiscoveredPrinter"]: - item_list = list(x for x in self._discovered_printer_by_ip_dict.values()) + item_list = list( + x for x in self._discovered_printer_by_ip_dict.values() if x.device.getProperty("temporary") != "true") item_list.sort(key = lambda x: x.device.name) return item_list From 367a12557f8c38edce3cd8fd450a56e309259eac Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 12 Apr 2019 13:14:35 +0200 Subject: [PATCH 2/3] Filter placeholders-devices: but use parseBool instead. [CURA-6057] --- cura/Machines/Models/DiscoveredPrintersModel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/DiscoveredPrintersModel.py b/cura/Machines/Models/DiscoveredPrintersModel.py index 7468b7cd8e..7b4fe48221 100644 --- a/cura/Machines/Models/DiscoveredPrintersModel.py +++ b/cura/Machines/Models/DiscoveredPrintersModel.py @@ -7,6 +7,7 @@ from PyQt5.QtCore import pyqtSlot, pyqtProperty, pyqtSignal, QObject from UM.i18n import i18nCatalog from UM.Logger import Logger +from UM.Util import parseBool if TYPE_CHECKING: from PyQt5.QtCore import QObject @@ -90,7 +91,7 @@ class DiscoveredPrintersModel(QObject): @pyqtProperty(list, notify = discoveredPrintersChanged) def discoveredPrinters(self) -> List["DiscoveredPrinter"]: item_list = list( - x for x in self._discovered_printer_by_ip_dict.values() if x.device.getProperty("temporary") != "true") + x for x in self._discovered_printer_by_ip_dict.values() if not parseBool(x.device.getProperty("temporary"))) item_list.sort(key = lambda x: x.device.name) return item_list From 3bfe7df04471d07784afa9b24ea1df7c01dde1b9 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 12 Apr 2019 15:45:10 +0200 Subject: [PATCH 3/3] Fix the alignment of the MachineSelectorButton Sometimes it was creating a button with width zero. Now it expands to the width of the container. Also fixing a small issue with the buttons and the link not being correctly aligned to the vertical center. Contributes to CURA-6057. --- .../AddNetworkPrinterScrollView.qml | 32 ++++++++----------- resources/qml/qmldir | 1 + 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index 924eeb930d..dc59ea05dd 100644 --- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml @@ -7,9 +7,6 @@ import QtQuick.Controls 2.3 import UM 1.3 as UM import Cura 1.1 as Cura -import "../PrinterSelector" - - // // This is the widget for adding a network printer. There are 2 parts in this widget. One is a scroll view of a list // of discovered network printers. Beneath the scroll view is a container with 3 buttons: "Refresh", "Add by IP", and @@ -84,13 +81,11 @@ Item } } - delegate: MachineSelectorButton + delegate: Cura.MachineSelectorButton { text: modelData.device.name - anchors.left: parent.left - anchors.right: parent.right - anchors.rightMargin: UM.Theme.getSize("default_margin").width + width: networkPrinterListView.width outputDevice: modelData.device enabled: !modelData.isUnknownMachineType @@ -119,22 +114,23 @@ Item } } + // Horizontal line separating the buttons (below) and the discovered network printers (above) + Rectangle + { + id: separator + anchors.left: parent.left + anchors.top: networkPrinterInfo.bottom + anchors.right: parent.right + height: UM.Theme.getSize("default_lining").height + color: UM.Theme.getColor("lining") + } + Item { id: controlsRectangle anchors.left: parent.left anchors.right: parent.right - anchors.top: networkPrinterInfo.bottom - - // Horizontal line separating the buttons (below) and the discovered network printers (above) - Rectangle - { - anchors.left: parent.left - anchors.top: parent.top - anchors.right: parent.right - height: UM.Theme.getSize("default_lining").width - color: UM.Theme.getColor("lining") - } + anchors.top: separator.bottom height: UM.Theme.getSize("message_action_button").height + UM.Theme.getSize("default_margin").height diff --git a/resources/qml/qmldir b/resources/qml/qmldir index 68c4fa82bc..b4881bde77 100644 --- a/resources/qml/qmldir +++ b/resources/qml/qmldir @@ -1,6 +1,7 @@ module Cura MachineSelector 1.0 MachineSelector.qml +MachineSelectorButton 1.0 MachineSelectorButton.qml CustomConfigurationSelector 1.0 CustomConfigurationSelector.qml PrintSetupSelector 1.0 PrintSetupSelector.qml ActionButton 1.0 ActionButton.qml