From 231396b674876eccc84230a795b601a7aae298a9 Mon Sep 17 00:00:00 2001
From: SeeLook <seelook@gmail.com>
Date: Fri, 7 Feb 2025 16:40:23 +0100
Subject: [PATCH] Use Nootka.Music import

---
 src/qml/MainScore.qml          |  6 ++++--
 src/qml/score/Clef.qml         |  3 ++-
 src/qml/score/ClefDrawer.qml   | 35 +++++++++++++++++++++-------------
 src/qml/score/KeySignature.qml |  2 +-
 src/qml/score/Meter.qml        |  4 ++--
 src/qml/score/NoteCursor.qml   |  2 +-
 src/qml/score/ScoreToolbox.qml |  2 +-
 src/qml/score/Staff.qml        |  1 +
 src/qml/shared/ClefMenu.qml    |  2 +-
 9 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/src/qml/MainScore.qml b/src/qml/MainScore.qml
index 9045a4f2..243ff879 100644
--- a/src/qml/MainScore.qml
+++ b/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 {
diff --git a/src/qml/score/Clef.qml b/src/qml/score/Clef.qml
index 82525eb8..ea2185a3 100644
--- a/src/qml/score/Clef.qml
+++ b/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
diff --git a/src/qml/score/ClefDrawer.qml b/src/qml/score/ClefDrawer.qml
index 099fc434..20a19908 100644
--- a/src/qml/score/ClefDrawer.qml
+++ b/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
+    property alias selectedClef: clefMenu.selClef
+    property alias clefMenu: clefMenu
+
+    width: NOO.factor() * 19
+    height: parent.height
+    visible: true
+    Component.onCompleted: selectedClef = score.clef
+
+    ClefMenu {
+        id: clefMenu
 
-  width: NOO.factor() * 19; height: parent.height
-  visible: true
-  background: GlowRect { color: activPal.window; cornerRadius: NOO.factor() / 2; radius: 0 }
+        onClicked: cl => {
+            close();
+            score.clef = cl;
+        }
+    }
 
-  ClefMenu {
-    id: clefMenu
-    onClicked: { close(); score.clef = cl }
-  }
+    background: GlowRect {
+        color: activPal.window
+        cornerRadius: NOO.factor() / 2
+        radius: 0
+    }
 
-  Component.onCompleted: selectedClef = score.clef
 }
diff --git a/src/qml/score/KeySignature.qml b/src/qml/score/KeySignature.qml
index 65b56f0b..6d939fff 100644
--- a/src/qml/score/KeySignature.qml
+++ b/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
diff --git a/src/qml/score/Meter.qml b/src/qml/score/Meter.qml
index 6c831320..0e40ced2 100644
--- a/src/qml/score/Meter.qml
+++ b/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)
     }
   }
 }
diff --git a/src/qml/score/NoteCursor.qml b/src/qml/score/NoteCursor.qml
index 5423c855..1e89163f 100644
--- a/src/qml/score/NoteCursor.qml
+++ b/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
diff --git a/src/qml/score/ScoreToolbox.qml b/src/qml/score/ScoreToolbox.qml
index e33edb74..7432d4c0 100644
--- a/src/qml/score/ScoreToolbox.qml
+++ b/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
diff --git a/src/qml/score/Staff.qml b/src/qml/score/Staff.qml
index d1136c58..69a2ffa0 100644
--- a/src/qml/score/Staff.qml
+++ b/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
 
diff --git a/src/qml/shared/ClefMenu.qml b/src/qml/shared/ClefMenu.qml
index 4bd4fa7f..3ff476bb 100644
--- a/src/qml/shared/ClefMenu.qml
+++ b/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
-- 
GitLab