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

Fix merge mistakes

Browse source 
CURA-8609
This commit is contained in:
Jaime van Kessel 2021-10-27 14:42:00 +02:00
parent 88d08b27d1
commit 79117d5898
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cura/Machines/Models/MaterialManagementModel.py
View file

@ -2,10 +2,12 @@
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
import copy # To duplicate materials. import copy # To duplicate materials.
from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QUrl
from PyQt5.QtGui import QDesktopServices
from typing import Any, Dict, Optional, TYPE_CHECKING from typing import Any, Dict, Optional, TYPE_CHECKING
import uuid # To generate new GUIDs for new materials. import uuid # To generate new GUIDs for new materials.
from UM.Message import Message
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
from UM.Logger import Logger from UM.Logger import Logger
from UM.Resources import Resources # To find QML files. from UM.Resources import Resources # To find QML files.
@ -29,13 +31,9 @@ class MaterialManagementModel(QObject):
:param The base file of the material is provided as parameter when this emits :param The base file of the material is provided as parameter when this emits
""" """
<<<<<<< HEAD
def __init__(self, parent: QObject = None):
super().__init__(parent)
self._material_sync = CloudMaterialSync(parent = self)
=======
def __init__(self, parent: Optional[QObject] = None) -> None: def __init__(self, parent: Optional[QObject] = None) -> None:
super().__init__(parent = parent) super().__init__(parent = parent)
self._material_sync = CloudMaterialSync(parent=self)
self._checkIfNewMaterialsWereInstalled() self._checkIfNewMaterialsWereInstalled()
def _checkIfNewMaterialsWereInstalled(self) -> None: def _checkIfNewMaterialsWereInstalled(self) -> None:
@ -91,7 +89,7 @@ class MaterialManagementModel(QObject):
sync_message.hide() sync_message.hide()
elif sync_message_action == "learn_more": elif sync_message_action == "learn_more":
QDesktopServices.openUrl(QUrl("https://support.ultimaker.com/hc/en-us/articles/360013137919?utm_source=cura&utm_medium=software&utm_campaign=sync-material-printer-message")) QDesktopServices.openUrl(QUrl("https://support.ultimaker.com/hc/en-us/articles/360013137919?utm_source=cura&utm_medium=software&utm_campaign=sync-material-printer-message"))
>>>>>>> master
@pyqtSlot("QVariant", result = bool) @pyqtSlot("QVariant", result = bool)
def canMaterialBeRemoved(self, material_node: "MaterialNode") -> bool: def canMaterialBeRemoved(self, material_node: "MaterialNode") -> bool: