Skip to content
Snippets Groups Projects
Commit 4c0fea8a authored by SeeLook's avatar SeeLook :musical_note:
Browse files

Added missing Nootka.Music import and/or fix JS Connections

parent af4267a4
No related branches found
No related tags found
No related merge requests found
Showing with 35 additions and 26 deletions
......@@ -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
......
......
......@@ -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
......
......
......@@ -4,7 +4,8 @@
import "../"
import Nootka 1.0
import QtQuick 2.12
import QtQuick
import Nootka.Music
import Score 1.0
TpopupDialog {
......
......
......@@ -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 {
......
......
......@@ -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)
......
......
......@@ -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 }
}
}
......@@ -118,7 +118,7 @@ ControlBase {
Connections {
target: item
function onClicked : void {
function onClicked() : void {
scoreObj.workRtmValue = item.rhythm;
scoreObj.workRtmRest = item.rest;
}
......
......
......@@ -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
......
......
......@@ -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-- }
}
}
......@@ -4,7 +4,8 @@
import "../"
import Nootka 1.0
import QtQuick 2.12
import QtQuick
import Nootka.Music
import QtQuick.Controls 2.12
TnotesBarItem {
......
......
......@@ -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--;
}
}
......
......
......@@ -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 {
......
......
......@@ -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
......
......
......@@ -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 {
......
......
......@@ -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 {
......
......
......@@ -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 {
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment