Browse Source

Merge branch 'feature_extension_separator' of https://github.com/fieldOfView/Cura

Jaime van Kessel 5 years ago
parent
commit
3e58d96da4
1 changed files with 28 additions and 5 deletions
  1. 28 5
      resources/qml/MainWindow/ApplicationMenu.qml

+ 28 - 5
resources/qml/MainWindow/ApplicationMenu.qml

@@ -68,13 +68,17 @@ Item
                     Instantiator
                     {
                         model: actions
-                        MenuItem
+                        Loader
                         {
-                            text: model.text
-                            onTriggered: extensions.model.subMenuTriggered(name, model.text)
+                            property var extensionsModel: extensions.model
+                            property var modelText: model.text
+                            property var extensionName: name
+
+                            sourceComponent: modelText.trim() == "" ? extensionsMenuSeparator : extensionsMenuItem
                         }
-                        onObjectAdded: sub_menu.insertItem(index, object)
-                        onObjectRemoved: sub_menu.removeItem(object)
+
+                        onObjectAdded: sub_menu.insertItem(index, object.item)
+                        onObjectRemoved: sub_menu.removeItem(object.item)
                     }
                 }
 
@@ -106,6 +110,25 @@ Item
         }
     }
 
+    Component
+    {
+        id: extensionsMenuItem
+
+        MenuItem
+        {
+            text: modelText
+            onTriggered: extensionsModel.subMenuTriggered(extensionName, modelText)
+        }
+    }
+
+    Component
+    {
+        id: extensionsMenuSeparator
+
+        MenuSeparator {}
+    }
+
+
     // ###############################################################################################
     // Definition of other components that are linked to the menus
     // ###############################################################################################