3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 14:55:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert CURA-8055 in the 4.10 branch. This should not have been merged in there.

Browse source 
Revert "Change file extension to .umm"

This reverts commit 56db7f7144.

Revert "Re-enable compression"

This reverts commit 62bc9be22b.

Revert "Add documentation"

This reverts commit e9031f1aff.

Revert "Fix writing bytes to string-stream"

This reverts commit 66b2825a66.

Revert "Hide button entirely if no export is available"

This reverts commit ec727e1068.

Revert "Basic implementation of exporting all materials in a .zip archive"

This reverts commit bdcaef134f.

Revert "Implement default path for exporting all materials"

This reverts commit e66783664b.

Revert "Implement a sync button and file dialogue to export all materials"

This reverts commit abba3bdd10.

Revert "Add notion of whether printers support the material export archive"

This reverts commit f436cb8e7b.
This commit is contained in:
Ghostkeeper 2021-06-24 14:11:48 +02:00
parent aabbdd2040
commit 4d29de4579
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
6 changed files with 4 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/definitions/ultimaker2_plus_connect.def.json
View file

@ -22,8 +22,7 @@
"0": "ultimaker2_plus_connect_extruder_0"
},
"supports_usb_connection": false,
"supports_network_connection": true,
"supports_material_export": true
"supports_network_connection": true
},
"overrides": {

1
resources/definitions/ultimaker_s3.def.json
View file

@ -27,7 +27,6 @@
"first_start_actions": [ "DiscoverUM3Action" ],
"supported_actions": [ "DiscoverUM3Action" ],
"supports_usb_connection": false,
"supports_material_export": true,
"weight": -1,
"firmware_update_info": {
"id": 213482,

1
resources/definitions/ultimaker_s5.def.json
View file

@ -28,7 +28,6 @@
"supported_actions": [ "DiscoverUM3Action" ],
"supports_usb_connection": false,
"supports_network_connection": true,
"supports_material_export": true,
"weight": -2,
"firmware_update_info": {
"id": 9051,

32
resources/qml/Preferences/Materials/MaterialsPage.qml
View file

@ -1,5 +1,5 @@
// Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
// Copyright (c) 2018 Ultimaker B.V.
// Uranium is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick.Controls 1.4
@ -191,20 +191,6 @@ Item
}
enabled: base.hasCurrentItem
}
//Sync button.
Button
{
id: syncMaterialsButton
text: catalog.i18nc("@action:button Sending materials to printers", "Sync with Printers")
iconName: "sync-synchronizing"
onClicked:
{
forceActiveFocus();
exportAllMaterialsDialog.open();
}
visible: Cura.MachineManager.activeMachine.supportsMaterialExport
}
}
Item {
@ -382,20 +368,6 @@ Item
}
}
FileDialog
{
id: exportAllMaterialsDialog
title: catalog.i18nc("@title:window", "Export All Materials")
selectExisting: false
nameFilters: ["Material archives (*.umm)", "All files (*)"]
folder: base.materialManagementModel.preferredExportAllPath
onAccepted:
{
base.materialManagementModel.exportAll(fileUrl);
CuraApplication.setDefaultPath("dialog_material_path", folder);
}
}
MessageDialog
{
id: messageDialog