Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Prado Gesto <d.pradogesto@ultimaker.com>2018-10-18 18:13:15 +0300
committerDiego Prado Gesto <d.pradogesto@ultimaker.com>2018-10-18 18:13:15 +0300
commit93b04190f803b16e8409ac94f843f2605a347ed8 (patch)
tree889c2cb9e04a7f73046c089be2ca7ba3a38676c1 /plugins/PrepareStage/PrepareMenu.qml
parent8df3eb33d45fd89bc4e7b0789ba03cfdc1020c4f (diff)
Change name of some components to make them more indicative of what they
do. Contributes to CURA-5772.
Diffstat (limited to 'plugins/PrepareStage/PrepareMenu.qml')
-rw-r--r--plugins/PrepareStage/PrepareMenu.qml23
1 files changed, 19 insertions, 4 deletions
diff --git a/plugins/PrepareStage/PrepareMenu.qml b/plugins/PrepareStage/PrepareMenu.qml
index 10ff0b2310..8d0f03ec2f 100644
--- a/plugins/PrepareStage/PrepareMenu.qml
+++ b/plugins/PrepareStage/PrepareMenu.qml
@@ -13,6 +13,9 @@ Item
signal showTooltip(Item item, point location, string text)
signal hideTooltip()
+ property bool isNetworkPrinter: Cura.MachineManager.activeMachineNetworkKey != ""
+ property bool printerConnected: Cura.MachineManager.printerConnected
+
UM.I18nCatalog
{
id: catalog
@@ -37,19 +40,31 @@ Item
{
id: spacing
width: UM.Theme.getSize("default_margin").width
- height: parent.height
+ height: prepareMenu.height
+ }
+
+ Cura.MachineSelector
+ {
+ id: machineSelection
+ width: UM.Theme.getSize("sidebar").width
+ height: prepareMenu.height
}
- Cura.MachineAndConfigurationSelector
+ Cura.QuickConfigurationSelector
{
+ id: configSelection
+ visible: isNetworkPrinter && printerConnected
+ width: visible ? Math.round(machineSelection.width * 0.15) : 0
+ panelWidth: machineSelection.width
+ height: prepareMenu.height
}
- Cura.MaterialAndVariantSelector
+ Cura.CustomConfigurationSelector
{
width: UM.Theme.getSize("sidebar").width
}
- Cura.ProfileAndSettingComponent
+ Cura.PrintSetupSelector
{
width: UM.Theme.getSize("sidebar").width
onShowTooltip: prepareMenu.showTooltip(item, location, text)