CURA-4870 Don't show the configuration selector if the printer is not a

network printer (for example don't show if is USB)
This commit is contained in:
Diego Prado Gesto 2018-03-14 11:54:10 +01:00
parent c69987b824
commit 23a2b6e0f7
3 changed files with 11 additions and 6 deletions

View file

@ -12,7 +12,7 @@ import "Menus"
ToolButton {
id: base
property var isNetworkPrinter: Cura.MachineManager.activeMachineNetworkKey != ""
property bool isNetworkPrinter: Cura.MachineManager.activeMachineNetworkKey != ""
property var printerStatus: Cura.MachineManager.printerOutputDevices.length != 0 ? "connected" : "disconnected"
text: isNetworkPrinter ? Cura.MachineManager.activeMachineNetworkGroupName : Cura.MachineManager.activeMachineName

View file

@ -17,11 +17,15 @@ Button
width: parent.width
height: parent.height
function updateOnSync() {
if (outputDevice != undefined) {
for (var index in outputDevice.uniqueConfigurations) {
function updateOnSync()
{
if (outputDevice != undefined)
{
for (var index in outputDevice.uniqueConfigurations)
{
var configuration = outputDevice.uniqueConfigurations[index]
if (Cura.MachineManager.matchesConfiguration(configuration)) {
if (Cura.MachineManager.matchesConfiguration(configuration))
{
base.matched = true;
return;
}

View file

@ -19,6 +19,7 @@ Rectangle
property bool hideView: Cura.MachineManager.activeMachineName == ""
// Is there an output device for this printer?
property bool isNetworkPrinter: Cura.MachineManager.activeMachineNetworkKey != ""
property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
property var connectedPrinter: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null
@ -106,7 +107,7 @@ Rectangle
ConfigurationSelection {
id: configSelection
visible: printerConnected && !sidebar.monitoringPrint && !sidebar.hideSettings
visible: isNetworkPrinter && !sidebar.monitoringPrint && !sidebar.hideSettings
width: visible ? Math.round(base.width * 0.15) : 0
height: UM.Theme.getSize("sidebar_header").height
anchors.top: base.top