Use Nootka.Music import

src/qml/MainScore.qml

@@ -2,11 +2,13 @@
  * Copyright (C) 2017-2021 by Tomasz Bojczuk (seelook@gmail.com)     *
  * on the terms of GNU GPLv3 license (http://www.gnu.org/licenses)   */
 
-import Nootka 1.0
-import Nootka.Main 1.0
 import QtQuick 2.12
 import QtQuick.Controls 2.12
+
+import Nootka 1.0
+import Nootka.Main 1.0
 import Score 1.0
+import Nootka.Music
 import "score"
 
 Score {

src/qml/score/Clef.qml

@@ -5,6 +5,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 
+import Nootka.Music
 import Nootka 1.0
 import Score 1.0
 
@@ -30,7 +31,7 @@ Text {
       if (clefDrawer)
           clefDrawer.open()
       else {
-          clefDrawer = Qt.createComponent("qrc:/score/ClefDrawer.qml").createObject(clef)
+          clefDrawer = Qt.createComponent("qrc:/score/ClefDrawer.qml").createObject(nootkaWindow.contentItem)
           clefDrawer.clefMenu.clicked.connect(clef.clicked)
       }
       clefDrawer.selectedClef = score.clef

src/qml/score/ClefDrawer.qml

@@ -2,24 +2,33 @@
  * Copyright (C) 2017-2021 by Tomasz Bojczuk (seelook@gmail.com)     *
  * on the terms of GNU GPLv3 license (http://www.gnu.org/licenses)   */
 
+import "../"
+import Nootka 1.0
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 
-import Nootka 1.0
-import "../"
-
 Drawer {
     property alias selectedClef: clefMenu.selClef
     property alias clefMenu: clefMenu
 
-  width: NOO.factor() * 19; height: parent.height
+    width: NOO.factor() * 19
+    height: parent.height
     visible: true
-  background: GlowRect { color: activPal.window; cornerRadius: NOO.factor() / 2; radius: 0 }
+    Component.onCompleted: selectedClef = score.clef
 
     ClefMenu {
         id: clefMenu
-    onClicked: { close(); score.clef = cl }
+
+        onClicked: cl => {
+            close();
+            score.clef = cl;
+        }
+    }
+
+    background: GlowRect {
+        color: activPal.window
+        cornerRadius: NOO.factor() / 2
+        radius: 0
     }
 
-  Component.onCompleted: selectedClef = score.clef
 }

src/qml/score/KeySignature.qml

@@ -7,7 +7,7 @@ import QtQuick.Controls 2.12
 
 import Nootka 1.0
 import Score 1.0
-
+import Nootka.Music
 
 Item {
   id: keySig

src/qml/score/Meter.qml

@@ -7,7 +7,7 @@ import QtQuick.Controls 2.12
 
 import Nootka 1.0
 import Score 1.0
-
+import Nootka.Music
 
 Text {
   id: meter
@@ -45,7 +45,7 @@ Text {
       if (meterDrawer)
         meterDrawer.open()
       else
-        meterDrawer = Qt.createComponent("qrc:/score/MeterDrawer.qml").createObject(meter)
+        meterDrawer = Qt.createComponent("qrc:/score/MeterDrawer.qml").createObject(nootkaWindow.contentItem)
     }
   }
 }

src/qml/score/NoteCursor.qml

@@ -6,7 +6,7 @@ import QtQuick 2.12
 
 import Nootka 1.0
 import Score 1.0
-
+import Nootka.Music
 
 Item {
   id: noteCursor

src/qml/score/ScoreToolbox.qml

@@ -6,7 +6,7 @@ import QtQuick 2.12
 
 import Nootka 1.0
 import Score 1.0
-
+import Nootka.Music
 
 ControlBase {
   id: toolbox

src/qml/score/Staff.qml

@@ -6,6 +6,7 @@ import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Window 2.12
 
+import Nootka.Music
 import Nootka 1.0
 import Score 1.0
 

src/qml/shared/ClefMenu.qml

@@ -7,7 +7,7 @@ import QtQuick.Controls 2.12
 
 import Nootka 1.0
 import Score 1.0
-
+import Nootka.Music
 
 ListView {
   id: clefMenu