Use new-style imports

This commit is contained in:
fieldOfView 2016-07-13 23:26:28 +02:00
parent 09c95001ed
commit 3f56685acc

View file

@ -1,26 +1,24 @@
from PyQt5.QtCore import pyqtSlot
from cura.MachineAction import MachineAction from cura.MachineAction import MachineAction
import cura.Settings.CuraContainerRegistry import cura.Settings.CuraContainerRegistry
from UM.i18n import i18nCatalog import UM.Application
from UM.Application import Application
import UM.Settings.InstanceContainer import UM.Settings.InstanceContainer
import UM.Settings.DefinitionContainer import UM.Settings.DefinitionContainer
from PyQt5.QtCore import pyqtSlot, QObject import UM.i18n
catalog = UM.i18n.i18nCatalog("cura")
class MachineSettingsAction(MachineAction):
catalog = i18nCatalog("cura")
class MachineSettingsAction(MachineAction, QObject):
def __init__(self, parent = None): def __init__(self, parent = None):
MachineAction.__init__(self, "MachineSettingsAction", catalog.i18nc("@action", "Machine Settings")) super().__init__("MachineSettingsAction", catalog.i18nc("@action", "Machine Settings"))
self._qml_url = "MachineSettingsAction.qml" self._qml_url = "MachineSettingsAction.qml"
cura.Settings.CuraContainerRegistry.getInstance().containerAdded.connect(self._onContainerAdded) cura.Settings.CuraContainerRegistry.getInstance().containerAdded.connect(self._onContainerAdded)
def _reset(self): def _reset(self):
global_container_stack = Application.getInstance().getGlobalContainerStack() global_container_stack = UM.Application.getInstance().getGlobalContainerStack()
if global_container_stack: if global_container_stack:
variant = global_container_stack.findContainer({"type": "variant"}) variant = global_container_stack.findContainer({"type": "variant"})
if variant and variant.getId() == "empty_variant": if variant and variant.getId() == "empty_variant":
@ -28,6 +26,7 @@ class MachineSettingsAction(MachineAction, QObject):
self._createVariant(global_container_stack, variant_index) self._createVariant(global_container_stack, variant_index)
def _createVariant(self, global_container_stack, variant_index): def _createVariant(self, global_container_stack, variant_index):
# Create and switch to a variant to store the settings in
new_variant = UM.Settings.InstanceContainer(global_container_stack.getName() + "_machinesettings") new_variant = UM.Settings.InstanceContainer(global_container_stack.getName() + "_machinesettings")
new_variant.addMetaDataEntry("type", "variant") new_variant.addMetaDataEntry("type", "variant")
new_variant.addMetaDataEntry("purpose", "machinesettings") new_variant.addMetaDataEntry("purpose", "machinesettings")
@ -35,14 +34,13 @@ class MachineSettingsAction(MachineAction, QObject):
UM.Settings.ContainerRegistry.getInstance().addContainer(new_variant) UM.Settings.ContainerRegistry.getInstance().addContainer(new_variant)
global_container_stack.replaceContainer(variant_index, new_variant) global_container_stack.replaceContainer(variant_index, new_variant)
def _onContainerAdded(self, container): def _onContainerAdded(self, container):
# Add this action as a supported action to all machine definitions # Add this action as a supported action to all machine definitions
if isinstance(container, UM.Settings.DefinitionContainer) and container.getMetaDataEntry("type") == "machine": if isinstance(container, UM.Settings.DefinitionContainer) and container.getMetaDataEntry("type") == "machine":
Application.getInstance().getMachineActionManager().addSupportedAction(container.getId(), self.getKey()) UM.Application.getInstance().getMachineActionManager().addSupportedAction(container.getId(), self.getKey())
@pyqtSlot() @pyqtSlot()
def forceUpdate(self): def forceUpdate(self):
# Force rebuilding the build volume by reloading the global container stack. # Force rebuilding the build volume by reloading the global container stack.
# This is a bit of a hack, but it seems quick enough. # This is a bit of a hack, but it seems quick enough.
Application.getInstance().globalContainerStackChanged.emit() UM.Application.getInstance().globalContainerStackChanged.emit()