spare_parts/apply_nootka_music.sh

+#!/bin/bash
+
+# Adds Nootka.Music import statement if any QML file uses given class:
+# Tmeter, Tclef, Tinstrument, Ttune and this import is missing
+
+# Check if an argument is provided
+if [ -z "$1" ]; then
+    echo "Usage: $0 <search_string>"
+    exit 1
+fi
+
+SEARCH_STRING="$1"
+
+# Find files containing the search string but not containing "import Nootka.Music"
+files=$(grep -l "$SEARCH_STRING" -R src/*qml | xargs grep -L "import Nootka.Music")
+
+# Loop through each file and replace the line
+for file in $files; do
+    echo $file
+    sed -i '/^import QtQuick 2\.12$/c\import QtQuick\nimport Nootka.Music' "$file"
+done

src/qml/level/MelodyPage.qml

@@ -5,7 +5,8 @@
 import "../"
 import "../score"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import QtQuick.Controls 2.12
 import Score 1.0
 

src/qml/level/RangePage.qml

@@ -5,7 +5,8 @@
 import "../"
 import "../score"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import QtQuick.Controls 2.12
 import Score 1.0
 

src/qml/score/MelodyPreview.qml

@@ -4,7 +4,8 @@
 
 import "../"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import Score 1.0
 
 TpopupDialog {

src/qml/score/Scordature.qml

@@ -3,7 +3,8 @@
  * on the terms of GNU GPLv3 license (http://www.gnu.org/licenses)   */
 
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import Score 1.0
 
 Grid {

src/qml/score/Score.qml

@@ -100,12 +100,10 @@ Flickable {
             if (allowAdding) {
                 if (!delControl)
                     delControl = Qt.createComponent("qrc:/score/DelControl.qml").createObject(contentItem);
-
                 if (!noteAdd)
                     noteAdd = Qt.createComponent("qrc:/score/NoteAdd.qml").createObject(contentItem);
-
                 if (!scoreToobox)
-                    scoreToobox = Qt.createComponent("qrc:/score/ScoreToolbox.qml").createObject(parent);
+                    scoreToobox = Qt.createComponent("qrc:/score/ScoreToolbox.qml").createObject(score);
 
             }
         }
@@ -117,7 +115,7 @@ Flickable {
                 });
             }
             if (!scoreToobox && !readOnly)
-                scoreToobox = Qt.createComponent("qrc:/score/ScoreToolbox.qml").createObject(parent);
+                scoreToobox = Qt.createComponent("qrc:/score/ScoreToolbox.qml").createObject(score);
 
         }
         onScoreWasCleared: ensureVisible(0, 0)

src/qml/score/ScoreCursor.qml

@@ -15,8 +15,8 @@ NoteCursor {
     // hide cursor after click on a note to show what was selected
     Connections {
         target: scoreObj
-        onClicked: allow = false
-        onActiveYposChanged: allow = scoreObj.activeYpos > 0
+        function onClicked() : void { allow = false }
+        function onActiveYposChanged() : void { allow = scoreObj.activeYpos > 0 }
     }
 
 }

src/qml/score/ScoreToolbox.qml

@@ -118,7 +118,7 @@ ControlBase {
 
                         Connections {
                             target: item
-                            function onClicked : void {
+                            function onClicked() : void {
                                 scoreObj.workRtmValue = item.rhythm;
                                 scoreObj.workRtmRest = item.rest;
                             }

src/qml/settings/ScorePage.qml

@@ -4,7 +4,8 @@
 
 import "../"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import QtQuick.Controls 2.12
 import QtQuick.Layouts
 import Score 1.0

src/qml/sound/+android/TunerDialog.qml

@@ -2,7 +2,8 @@
  * Copyright (C) 2018-2021 by Tomasz Bojczuk (seelook@gmail.com)     *
  * on the terms of GNU GPLv3 license (http://www.gnu.org/licenses)   */
 
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import QtQuick.Controls 2.12
 
 import Nootka 1.0
@@ -268,7 +269,7 @@ TtunerDialogItem {
 
   Connections {
     target: SOUND
-    onVolumeUpPressed: volSlider.value++
-    onVolumeDownPressed: volSlider.value--
+    function onVolumeUpPressed() : void { volSlider.value++ }
+    function onVolumeDownPressed() : void { volSlider.value-- }
   }
 }

src/qml/sound/NotesDiffBar.qml

@@ -4,7 +4,8 @@
 
 import "../"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import QtQuick.Controls 2.12
 
 TnotesBarItem {

src/qml/sound/TunerDialog.qml

@@ -6,7 +6,8 @@ import "../"
 import "../settings"
 import Nootka 1.0
 import Nootka.Dialogs 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import QtQuick.Controls 2.12
 
 TtunerDialogItem {
@@ -312,15 +313,13 @@ TtunerDialogItem {
 
     Connections {
         target: SOUND
-        onVolumeUpPressed: {
+        function onVolumeUpPressed() : void {
             if (NOO.isAndroid())
                 volSlider.value++;
-
         }
-        onVolumeDownPressed: {
+        function onVolumeDownPressed() : void {
             if (NOO.isAndroid())
                 volSlider.value--;
-
         }
     }
 

src/qml/wizard/WizardGuitars.qml

@@ -5,7 +5,8 @@
 import "../"
 import "../score"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import Score 1.0
 
 Column {

src/qml/wizard/WizardMode.qml

@@ -5,7 +5,8 @@
 import "../"
 import "../score"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import QtQuick.Controls 2.12
 import Score 1.0
 

src/qml/wizard/WizardOther.qml

@@ -5,7 +5,8 @@
 import "../"
 import "../score"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import Score 1.0
 
 Column {

src/qml/wizard/WizardPiano.qml

@@ -5,7 +5,8 @@
 import "../"
 import "../score"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import Score 1.0
 
 Column {

src/qml/wizard/WizardUkulele.qml

@@ -5,7 +5,8 @@
 import "../"
 import "../score"
 import Nootka 1.0
-import QtQuick 2.12
+import QtQuick
+import Nootka.Music
 import Score 1.0
 
 Column {