Moved the prepareMenu into the prepare stage plugin

CURA-5772
This commit is contained in:
Jaime van Kessel 2018-10-12 13:29:57 +02:00
parent 10de312647
commit 7d5472b09f
2 changed files with 47 additions and 1 deletions

View file

@ -0,0 +1,42 @@
import QtQuick 2.7
import QtQuick.Controls 1.4
import UM 1.3 as UM
import Cura 1.1 as Cura
Row
{
spacing: UM.Theme.getSize("default_margin").width
UM.I18nCatalog
{
id: catalog
name:"cura"
}
Button
{
id: openFileButton;
text: catalog.i18nc("@action:button", "Open File");
iconSource: UM.Theme.getIcon("load")
style: UM.Theme.styles.tool_button
tooltip: ""
action: Cura.Actions.open;
}
Cura.MachineAndConfigurationSelector
{
}
Cura.MaterialAndVariantSelector
{
width: UM.Theme.getSize("sidebar").width
}
Cura.ProfileAndSettingComponent
{
width: UM.Theme.getSize("sidebar").width
}
}

View file

@ -2,13 +2,14 @@
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
import os.path import os.path
from UM.Application import Application from UM.Application import Application
from UM.PluginRegistry import PluginRegistry
from UM.Resources import Resources from UM.Resources import Resources
from cura.Stages.CuraStage import CuraStage from cura.Stages.CuraStage import CuraStage
## Stage for preparing model (slicing). ## Stage for preparing model (slicing).
class PrepareStage(CuraStage): class PrepareStage(CuraStage):
def __init__(self, parent = None): def __init__(self, parent = None):
super().__init__(parent) super().__init__(parent)
Application.getInstance().engineCreatedSignal.connect(self._engineCreated) Application.getInstance().engineCreatedSignal.connect(self._engineCreated)
@ -16,4 +17,7 @@ class PrepareStage(CuraStage):
def _engineCreated(self): def _engineCreated(self):
sidebar_component_path = os.path.join(Resources.getPath(Application.getInstance().ResourceTypes.QmlFiles), sidebar_component_path = os.path.join(Resources.getPath(Application.getInstance().ResourceTypes.QmlFiles),
"PrepareSidebar.qml") "PrepareSidebar.qml")
menu_component_path = os.path.join(PluginRegistry.getInstance().getPluginPath("PrepareStage"), "PrepareMenu.qml")
self.addDisplayComponent("menu", menu_component_path)
self.addDisplayComponent("sidebar", sidebar_component_path) self.addDisplayComponent("sidebar", sidebar_component_path)