.gitignore

@@ -77,3 +77,4 @@ Thumbs.db
 *local.properties
 *CMakeLists.txt.user
 *android.iml
+*qmlls.ini

spare_parts/FontTest.qml

+// pragma ComponentBehavior: Bound
+
+import QtQuick 2.15
+import QtQuick.Window 2.15
+
+Window {
+    id: mainWin
+
+    width: 1024
+    height: 768
+
+    FontLoader {
+        id: bravuraFont
+
+        source: "./Bravura.otf"
+    }
+
+    Repeater {
+        model: 5
+
+        Rectangle {
+            x: 10
+            y: 240 + (index * 20)
+            width: mainWin.width - 20
+            height: 1
+            color: "black"
+        }
+
+    }
+
+    Rectangle {
+        anchors.fill: clef
+        color: "#80aaaaaa"
+        Component.onCompleted: console.log(width, height)
+    }
+
+    Text {
+        id: clef
+
+        x: 10
+        y: 78
+        text: "\ue062"
+
+        font {
+            family: bravuraFont.name
+            pixelSize: 92
+        }
+
+    }
+
+}

src/qml/level/LevelPreview.qml

@@ -51,7 +51,7 @@ TlevelPreviewItem {
             // HACK: keeping MouseArea inside PinchArea makes it working
             MouseArea {
                 anchors.fill: parent
-                onWheel: {
+                onWheel: wheel => {
                     if (wheel.modifiers & Qt.ControlModifier) {
                         if (wheel.angleDelta.y > 0)
                             zoom(true);

src/qml/nootini/AudioAnalyze.qml

@@ -48,7 +48,7 @@ TaudioAnalyzeItem {
 
         MouseArea {
             anchors.fill: parent
-            onWheel: {
+            onWheel: wheel => {
                 if (wheel.modifiers & Qt.ControlModifier) {
                     if (wheel.angleDelta.y > 0)
                         sc *= 1.0625;

src/qml/score/KeySignature.qml

@@ -16,7 +16,7 @@ Item {
     readonly property var flatPos: [4, 1, 5, 2, 6, 3, 7]
 
     function accidOffset(c) {
-        var accidOff = 1;
+        let accidOff = 1;
         switch (c) {
         case Tclef.Bass_F:
         case Tclef.Bass_F_8down:
@@ -134,7 +134,7 @@ Item {
                 else
                     keyDown();
             }
-            onWheel: {
+            onWheel: wheel => {
                 if (wheel.angleDelta.y > 0)
                     deltaUp();
                 else if (wheel.angleDelta.y < 0)

src/qml/score/Staff.qml

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

src/qml/sound/TempoBar.qml

@@ -48,7 +48,7 @@ Item {
                     }
                     tMenu.open();
                 }
-                onWheel: {
+                onWheel: wheel => {
                     if (!SOUND.metroRunning) {
                         if (wheel.angleDelta.y > 0)
                             SOUND.tempo = SOUND.tempo + (wheel.modifiers & Qt.ControlModifier ? 10 : 1);
@@ -210,11 +210,10 @@ Item {
 
     Connections {
         target: SOUND
-        function onCountdownPrepare() : void {
+        function onCountdownPrepare(tickCount) : void {
             if (SOUND.tickBeforePlay && !GLOB.singleNoteMode) {
                 if (!preCountItem) {
-                    var d = Qt.createComponent("qrc:/sound/CountdownItem.qml");
-                    preCountItem = d.createObject(score);
+                    preCountItem = Qt.createComponent("qrc:/sound/CountdownItem.qml").createObject(score);
                 }
                 preCountItem.tickCount = tickCount;
                 preCountItem.counter = 1;

src/qml/sound/TempoMenu.qml

@@ -95,7 +95,7 @@ Popup {
                 MouseArea {
                     anchors.fill: parent
                     z: -1
-                    onWheel: {
+                    onWheel: wheel => {
                         var ci = buTumb.currentIndex;
                         if (wheel.angleDelta.y > 0)
                             ci--;
@@ -282,7 +282,7 @@ Popup {
             enabled: !executor
 
             ButtonGroup {
-                buttons: radioRow.children
+                id: quantGr
             }
 
             MouseArea {
@@ -321,6 +321,7 @@ Popup {
                     text: "G"
                     textScale: 2
                     checked: SOUND.quantization === 6
+                    ButtonGroup.group: quantGr
                     onClicked: SOUND.quantization = 6
                     onHoveredChanged: NOO.setStatusTip(hovered ? quantTip : "", Item.TopLeft)
 
@@ -336,6 +337,7 @@ Popup {
                     text: "F"
                     textScale: 2
                     checked: SOUND.quantization === 12
+                    ButtonGroup.group: quantGr
                     onClicked: SOUND.quantization = 12
                     onHoveredChanged: NOO.setStatusTip(hovered ? quantTip : "", Item.TopLeft)