3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'main' into CURA-10475_engineplugin

Browse source
This commit is contained in:
Jelle Spijker 2023-08-07 09:05:15 +02:00
commit c6fb3fe59c
No known key found for this signature in database
GPG key ID: 034D1C0527888B65
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conanfile.py
View file

@ -10,7 +10,7 @@ from conan.tools.env import VirtualRunEnv, Environment, VirtualBuildEnv
from conan.tools.scm import Version from conan.tools.scm import Version
from conan.errors import ConanInvalidConfiguration, ConanException from conan.errors import ConanInvalidConfiguration, ConanException
required_conan_version = "<=1.60.0" required_conan_version = ">=1.54 <=1.56.0 || >=1.58.0 <2.0.0"
class CuraConan(ConanFile): class CuraConan(ConanFile):

14
cura/Machines/Models/MachineListModel.py
View file

@ -110,22 +110,22 @@ class MachineListModel(ListModel):
for abstract_machine in abstract_machine_stacks: for abstract_machine in abstract_machine_stacks:
definition_id = abstract_machine.definition.getId() definition_id = abstract_machine.definition.getId()
online_machine_stacks = machines_manager.getMachinesWithDefinition(definition_id, online_only = True) connected_machine_stacks = machines_manager.getMachinesWithDefinition(definition_id, online_only = False)
online_machine_stacks = list(filter(lambda machine: machine.hasNetworkedConnection(), online_machine_stacks)) connected_machine_stacks = list(filter(lambda machine: machine.hasNetworkedConnection(), connected_machine_stacks))
online_machine_stacks.sort(key=lambda machine: machine.getName().upper()) connected_machine_stacks.sort(key=lambda machine: machine.getName().upper())
if abstract_machine in other_machine_stacks: if abstract_machine in other_machine_stacks:
other_machine_stacks.remove(abstract_machine) other_machine_stacks.remove(abstract_machine)
if abstract_machine in online_machine_stacks: if abstract_machine in connected_machine_stacks:
online_machine_stacks.remove(abstract_machine) connected_machine_stacks.remove(abstract_machine)
# Create a list item for abstract machine # Create a list item for abstract machine
self.addItem(abstract_machine, True, len(online_machine_stacks)) self.addItem(abstract_machine, True, len(connected_machine_stacks))
# Create list of machines that are children of the abstract machine # Create list of machines that are children of the abstract machine
for stack in online_machine_stacks: for stack in connected_machine_stacks:
if self._show_cloud_printers: if self._show_cloud_printers:
self.addItem(stack, True) self.addItem(stack, True)
# Remove this machine from the other stack list # Remove this machine from the other stack list

2
plugins/Marketplace/resources/qml/Marketplace.qml
View file

@ -280,7 +280,7 @@ Window
onClicked: onClicked:
{ {
marketplaceDialog.hide(); marketplaceDialog.hide();
CuraApplication.closeApplication(); CuraApplication.checkAndExitApplication();
} }
} }
} }