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:
authorRemco Burema <41987080+rburema@users.noreply.github.com>2021-04-06 16:07:29 +0300
committerGitHub <noreply@github.com>2021-04-06 16:07:29 +0300
commitb5058352488de155088be04c5a2ee00bd9ce3b3b (patch)
tree6bee1c6f57901c9576c3df81eb270517bf93fad3
parent1132e4c6f918a42704d0e271e925a1fef9a0caaa (diff)
parentb2b258d35755844ea66fbbc071a2641cc1cd1b75 (diff)
Merge pull request #9509 from Ultimaker/Post_processing_script_add_script_fix
CURA-8127: Post processing script add script fix
-rw-r--r--plugins/PostProcessingPlugin/PostProcessingPlugin.qml13
1 files changed, 8 insertions, 5 deletions
diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml
index 743e149866..2b3a141aa0 100644
--- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml
+++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml
@@ -3,7 +3,9 @@
import QtQuick 2.2
import QtQuick.Controls 1.1
+import QtQuick.Controls 2.15 as QQC2
import QtQuick.Controls.Styles 1.1
+import QtQml.Models 2.15 as Models
import QtQuick.Layouts 1.1
import QtQuick.Dialogs 1.1
import QtQuick.Window 2.2
@@ -235,7 +237,7 @@ UM.Dialog
anchors.leftMargin: base.textMargin
anchors.top: activeScriptsList.bottom
anchors.topMargin: base.textMargin
- menu: scriptsMenu
+ onClicked: scriptsMenu.open()
style: ButtonStyle
{
label: Label
@@ -244,15 +246,16 @@ UM.Dialog
}
}
}
- Menu
+ QQC2.Menu
{
id: scriptsMenu
+ width: parent.width
- Instantiator
+ Models.Instantiator
{
model: manager.loadedScriptList
- MenuItem
+ QQC2.MenuItem
{
text: manager.getScriptLabelByKey(modelData.toString())
onTriggered: manager.addScriptToList(modelData.toString())
@@ -422,7 +425,7 @@ UM.Dialog
tooltip.target.x = position.x + 1
}
- onHideTooltip: tooltip.hide()
+ function onHideTooltip() { tooltip.hide() }
}
}
}