Create score menu on demand only, so exclude it to separate file, use TipRect...

Create score menu on demand only, so exclude it to separate file, use TipRect as a background item (also for TempoMenu).

src/nootka.qrc

@@ -11,6 +11,7 @@
     <file alias="DialogLoader.qml">qml/DialogLoader.qml</file>
     <file alias="+android/DialogDrawer.qml">qml/+android/DialogDrawer.qml</file>
     <file alias="NoteName.qml">qml/NoteName.qml</file>
+    <file alias="ScoreMenuContent.qml">qml/ScoreMenuContent.qml</file>
 
     <file alias="HeadButton.qml">qml/shared/HeadButton.qml</file>
     <file alias="PagesDialog.qml">qml/shared/PagesDialog.qml</file>

src/qml/MainMenu.qml

@@ -13,85 +13,10 @@ Item {
   TtoolBar { id: toolBar }
 
   function open() {
-    if (!scoreMenu)
-      scoreMenu = menuComp.createObject(this)
+    if (!scoreMenu) {
+      var c = Qt.createComponent("qrc:/ScoreMenuContent.qml")
+      scoreMenu = c.createObject(nootkaWindow.contentItem)
+    }
     scoreMenu.open()
   }
-
-  Component {
-      id: menuComp
-      Menu {
-        id: scoreMenu
-        width: Noo.fontSize() * 20
-        x: toolBar.scoreAct.x
-        y: score.y
-
-        MenuItem {
-          visible: !GLOB.isExam
-          contentItem: MenuButton {
-            action: score.playAct
-            onClicked: scoreMenu.close()
-          }
-        }
-        MenuItem {
-          visible: !GLOB.isExam
-          contentItem: MenuButton {
-            action: score.recModeAct
-            onClicked: scoreMenu.close()
-          }
-        }
-        MenuItem {
-          visible: !GLOB.isExam
-          contentItem: MenuButton {
-            action: score.openXmlAct
-            onClicked: scoreMenu.close()
-          }
-        }
-        MenuItem {
-          visible: !GLOB.isExam
-          contentItem: MenuButton {
-            action: score.saveXmlAct
-            onClicked: scoreMenu.close()
-          }
-        }
-        MenuItem {
-          visible: !GLOB.isExam
-          contentItem: MenuButton {
-            action: score.extraAccidsAct
-            onClicked: scoreMenu.close()
-          }
-        }
-        MenuItem {
-          visible: !GLOB.isExam
-          contentItem: MenuButton {
-            action: score.showNamesAct
-            onClicked: scoreMenu.close()
-          }
-        }
-        MenuItem {
-          contentItem: MenuButton {
-            action: score.zoomInAct
-            onClicked: scoreMenu.close()
-          }
-        }
-        MenuItem {
-          contentItem: MenuButton {
-            action: score.zoomOutAct
-            onClicked: scoreMenu.close()
-          }
-        }
-        MenuItem {
-          contentItem: MenuButton {
-            action: score.deleteLastAct
-            onClicked: scoreMenu.close()
-          }
-        }
-        MenuItem {
-          contentItem: MenuButton {
-            action: score.clearScoreAct
-            onClicked: scoreMenu.close()
-          }
-        }
-      }
-  }
 }

src/qml/ScoreMenuContent.qml

+/** This file is part of Nootka (http://nootka.sf.net)               *
+ * Copyright (C) 2017 by Tomasz Bojczuk (seelook@gmail.com)          *
+ * on the terms of GNU GPLv3 license (http://www.gnu.org/licenses)   */
+
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+
+
+Menu {
+  id: menu
+  width: Noo.fontSize() * 20
+  x: toolBar.scoreAct.x
+  y: score.y
+
+  background: TipRect { color: activPal.window }
+
+  Repeater {
+    model: score.scoreActions
+    MenuItem {
+      width: menu.width
+      contentItem: MenuButton {
+        action: modelData
+        onClicked: close()
+      }
+    }
+  }
+}

src/qml/shared/MenuButton.qml

@@ -74,12 +74,12 @@ Rectangle {
     anchors.fill: parent
     hoverEnabled: true
     onClicked: {
+      menuButton.clicked()
       if (action) {
         if (action.checkable)
           action.checked = !action.checked
         action.trigger()
       }
-      menuButton.clicked()
     }
   }
 }

src/qml/sound/TempoMenu.qml

@@ -14,6 +14,8 @@ Popup {
 
   margins: Noo.fontSize()
 
+  background: TipRect { color: activPal.window }
+
   signal accepted()
 
   Column {