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

Score/Staff: make qmllint happy

parent 7f24ab40
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/qml/score/Score.qml
+ 20
− 21
View file @ a8b4d63c
...@@ -79,46 +79,45 @@ Flickable { ...@@ -79,46 +79,45 @@ Flickable {
TscoreObject { TscoreObject {
id: scoreObj id: scoreObj
width: score.width / scale width: score.width / score.scale
enableDoubleAccidentals: score.enableDoubleAccids enableDoubleAccidentals: score.enableDoubleAccids
onClicked: currentNote = scoreObj.activeNote onClicked: score.currentNote = scoreObj.activeNote
onStaffCreate: { onStaffCreate: {
staves.push(Qt.createComponent("qrc:/score/Staff.qml").createObject(score.contentItem)); score.staves.push(Qt.createComponent("qrc:/score/Staff.qml").createObject(score.contentItem, { score: score }));
score.lastStaff = staves[staves.length - 1]; score.lastStaff = score.staves[score.staves.length - 1];
} }
onStavesHeightChanged: score.contentHeight = Math.max(stavesHeight, score.height) onStavesHeightChanged: score.contentHeight = Math.max(stavesHeight, score.height)
onStaffDestroying: staffNr => { onStaffDestroying: staffNr => {
staves.splice(staffNr, 1); score.staves.splice(staffNr, 1);
lastStaff = staves[staves.length - 1]; lastStaff = score.staves[score.staves.length - 1];
} }
onNoteWasAdded: { onNoteWasAdded: {
if (staves.length > 1) if (score.staves.length > 1)
ensureVisible(lastNote.staffItem.y, lastNote.staffItem.height * scale); ensureVisible(lastNote.staffItem.y, lastNote.staffItem.height * scale);
} }
onAllowAddingChanged: { onAllowAddingChanged: {
if (allowAdding) { if (allowAdding) {
if (!delControl) if (!score.delControl)
delControl = Qt.createComponent("qrc:/score/DelControl.qml").createObject(contentItem); score.delControl = Qt.createComponent("qrc:/score/DelControl.qml").createObject(score.contentItem);
if (!noteAdd) if (!score.noteAdd)
noteAdd = Qt.createComponent("qrc:/score/NoteAdd.qml").createObject(contentItem); score.noteAdd = Qt.createComponent("qrc:/score/NoteAdd.qml").createObject(score.contentItem);
if (!scoreToobox) if (!score.scoreToobox)
scoreToobox = Qt.createComponent("qrc:/score/ScoreToolbox.qml").createObject(score); score.scoreToobox = Qt.createComponent("qrc:/score/ScoreToolbox.qml").createObject(score);
} }
} }
onActiveNoteChanged: { onActiveNoteChanged: {
if (!cursor) { if (!score.cursor) {
cursor = Qt.createComponent("qrc:/score/ScoreCursor.qml").createObject(contentItem); score.cursor = Qt.createComponent("qrc:/score/ScoreCursor.qml").createObject(score.contentItem);
cursor.parent = Qt.binding(function() { score.cursor.parent = Qt.binding(function() {
return scoreObj.activeNote; return scoreObj.activeNote;
}); });
} }
if (!scoreToobox && !readOnly) if (!score.scoreToobox && !score.readOnly)
scoreToobox = Qt.createComponent("qrc:/score/ScoreToolbox.qml").createObject(score); score.scoreToobox = Qt.createComponent("qrc:/score/ScoreToolbox.qml").createObject(score);
} }
onScoreWasCleared: ensureVisible(0, 0) onScoreWasCleared: score.ensureVisible(0, 0)
} }
// entire score background // entire score background
...@@ -136,6 +135,7 @@ Flickable { ...@@ -136,6 +135,7 @@ Flickable {
Staff { Staff {
id: staff0 id: staff0
score: score
meter: Meter { meter: Meter {
parent: staff0 parent: staff0
} }
...@@ -165,7 +165,6 @@ Flickable { ...@@ -165,7 +165,6 @@ Flickable {
} }
} }
} }
ScrollBar.vertical: ScrollBar { ScrollBar.vertical: ScrollBar {
......
src/qml/score/Staff.qml
+ 22
− 16
View file @ a8b4d63c
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
* Copyright (C) 2017-2021 by Tomasz Bojczuk (seelook@gmail.com) * * Copyright (C) 2017-2021 by Tomasz Bojczuk (seelook@gmail.com) *
* on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */ * on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */
pragma ComponentBehavior: Bound
import Nootka 1.0 import Nootka 1.0
import Nootka.Music import Nootka.Music
import QtQuick 2.12 import QtQuick 2.12
...@@ -11,6 +13,7 @@ import Score 1.0 ...@@ -11,6 +13,7 @@ import Score 1.0
TstaffItem { TstaffItem {
id: staff id: staff
required property var score
property alias clef: clef property alias clef: clef
property real linesCount: score.clef === Tclef.PianoStaffClefs ? 49 : 38 property real linesCount: score.clef === Tclef.PianoStaffClefs ? 49 : 38
property var keySignItem: null property var keySignItem: null
...@@ -37,7 +40,7 @@ TstaffItem { ...@@ -37,7 +40,7 @@ TstaffItem {
Math.max(Screen.height / 4, Screen.pixelDensity * (NOO.isAndroid() ? 50 : 70))) / linesCount) * score.scaleFactor Math.max(Screen.height / 4, Screen.pixelDensity * (NOO.isAndroid() ? 50 : 70))) / linesCount) * score.scaleFactor
width: score.width / scale width: score.width / scale
transformOrigin: Item.TopLeft transformOrigin: Item.TopLeft
scoreObject: scoreObj scoreObject: score.scoreObj
notesIndent: firstNoteX notesIndent: firstNoteX
upperLine: score.clef === Tclef.PianoStaffClefs ? 14 : 16 upperLine: score.clef === Tclef.PianoStaffClefs ? 14 : 16
Component.onCompleted: checkIsKeyEnabled() Component.onCompleted: checkIsKeyEnabled()
...@@ -45,30 +48,30 @@ TstaffItem { ...@@ -45,30 +48,30 @@ TstaffItem {
TstaffLines { TstaffLines {
id: upperStaff id: upperStaff
x: score.clef === Tclef.PianoStaffClefs ? 3 : 0.5 x: staff.score.clef === Tclef.PianoStaffClefs ? 3 : 0.5
width: staff.width - (score.clef === Tclef.PianoStaffClefs ? 3.5 : 1) width: staff.width - (staff.score.clef === Tclef.PianoStaffClefs ? 3.5 : 1)
y: upperLine - 0.1 y: staff.upperLine - 0.1
staffScale: staff.scale staffScale: staff.scale
} }
Loader { Loader {
sourceComponent: score.clef === Tclef.PianoStaffClefs ? lowerStaff : null sourceComponent: staff.score.clef === Tclef.PianoStaffClefs ? lowerStaff : null
} }
Component { Component {
id: lowerStaff id: lowerStaff
TstaffLines { TstaffLines {
x: score.clef === Tclef.PianoStaffClefs ? 3 : 0.5 x: staff.score.clef === Tclef.PianoStaffClefs ? 3 : 0.5
width: staff.width - (score.clef === Tclef.PianoStaffClefs ? 3.5 : 1) width: staff.width - (staff.score.clef === Tclef.PianoStaffClefs ? 3.5 : 1)
y: upperLine - 0.1 + 22 y: staff.upperLine - 0.1 + 22
staffScale: staff.scale staffScale: staff.scale
} }
} }
Loader { Loader {
sourceComponent: score.clef === Tclef.PianoStaffClefs ? brace : null sourceComponent: staff.score.clef === Tclef.PianoStaffClefs ? brace : null
} }
Component { Component {
...@@ -92,22 +95,25 @@ TstaffItem { ...@@ -92,22 +95,25 @@ TstaffItem {
} }
Connections { Connections {
target: score target: staff.score
function onEnableKeySignChanged() : void { checkIsKeyEnabled() } function onEnableKeySignChanged() : void { staff.checkIsKeyEnabled(); }
} }
// measure number // measure number
Text { Text {
x: score.clef === Tclef.PianoStaffClefs ? 0.8 : 0.5 x: staff.score.clef === Tclef.PianoStaffClefs ? 0.8 : 0.5
y: upperLine - (score.clef === Tclef.Treble_G || score.clef === Tclef.Treble_G_8down || score.clef === Tclef.Tenor_C || score.clef === Tclef.PianoStaffClefs ? 8 : 5) y: staff.upperLine
text: firstMeasureNr + 1 - (staff.score.clef === Tclef.Treble_G || score.clef === Tclef.Treble_G_8down
visible: number > 0 && firstMeasureNr > 0 || score.clef === Tclef.Tenor_C || score.clef === Tclef.PianoStaffClefs
? 8 : 5)
text: staff.firstMeasureNr + 1
visible: staff.number > 0 && staff.firstMeasureNr > 0
scale: 0.4 scale: 0.4
transformOrigin: Item.TopLeft transformOrigin: Item.TopLeft
color: activPal.text color: activPal.text
font { font {
pixelSize: score.clef === Tclef.PianoStaffClefs ? 7 : 5 pixelSize: staff.score.clef === Tclef.PianoStaffClefs ? 7 : 5
family: "Scorek" family: "Scorek"
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment