From d7f7395efb0628eb6c67cb005fa266d69d3ec7cb Mon Sep 17 00:00:00 2001
From: SeeLook <945374+SeeLook@users.noreply.github.com>
Date: Sat, 27 Jan 2018 19:25:38 +0100
Subject: [PATCH] Move all QML components related to score into 'score'
directory
---
src/libs/core/score/tnoteitem.cpp | 2 +-
src/nootka.qrc | 36 ++++++++++++++---------------
src/qml/MainScore.qml | 1 +
src/qml/instruments/Instrument.qml | 1 +
src/qml/level/MelodyPage.qml | 3 ++-
src/qml/level/RangePage.qml | 3 ++-
src/qml/score/Clef.qml | 4 ++--
src/qml/score/ClefDrawer.qml | 3 ++-
src/qml/score/ControlBase.qml | 4 +++-
src/qml/score/Meter.qml | 4 ++--
src/qml/score/MeterDrawer.qml | 7 +++---
src/qml/score/NoteCursor.qml | 2 +-
src/qml/score/Score.qml | 8 +++----
src/qml/score/Staff.qml | 2 +-
src/qml/settings/InstrumentPage.qml | 1 +
src/qml/wizard/WizardClef.qml | 3 ++-
16 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/src/libs/core/score/tnoteitem.cpp b/src/libs/core/score/tnoteitem.cpp
index b390c0407..e411238fb 100644
--- a/src/libs/core/score/tnoteitem.cpp
+++ b/src/libs/core/score/tnoteitem.cpp
@@ -372,7 +372,7 @@ void TnoteItem::checkTie() {
delete m_tie;
m_tie = nullptr;
} else if (m_tie == nullptr && (m_note->rtm.tie() == Trhythm::e_tieStart || m_note->rtm.tie() == Trhythm::e_tieCont)) {
- QQmlComponent comp(m_staff->score()->qmlEngine(), QUrl(QStringLiteral("qrc:/Tie.qml")));
+ QQmlComponent comp(m_staff->score()->qmlEngine(), QUrl(QStringLiteral("qrc:/score/Tie.qml")));
m_tie = qobject_cast<QQuickItem*>(comp.create());
m_tie->setParentItem(m_head);
m_tie->setProperty("color", qApp->palette().text().color());
diff --git a/src/nootka.qrc b/src/nootka.qrc
index 8a6986441..0f4c270c0 100644
--- a/src/nootka.qrc
+++ b/src/nootka.qrc
@@ -36,24 +36,24 @@
<file alias="sound/TempoBar.qml">qml/sound/TempoBar.qml</file>
<file alias="sound/TempoMenu.qml">qml/sound/TempoMenu.qml</file>
- <file alias="Score.qml">qml/score/Score.qml</file>
- <file alias="Staff.qml">qml/score/Staff.qml</file>
- <file alias="Clef.qml">qml/score/Clef.qml</file>
- <file alias="ClefDrawer.qml">qml/score/ClefDrawer.qml</file>
- <file alias="KeySignature.qml">qml/score/KeySignature.qml</file>
- <file alias="Meter.qml">qml/score/Meter.qml</file>
- <file alias="MeterDrawer.qml">qml/score/MeterDrawer.qml</file>
- <file alias="Tie.qml">qml/score/Tie.qml</file>
- <file alias="AddLine.qml">qml/score/AddLine.qml</file>
- <file alias="NoteCursor.qml">qml/score/NoteCursor.qml</file>
- <file alias="NotePrompt.qml">qml/score/NotePrompt.qml</file>
- <file alias="AccidControl.qml">qml/score/AccidControl.qml</file>
- <file alias="RhythmControl.qml">qml/score/RhythmControl.qml</file>
- <file alias="ControlButton.qml">qml/score/ControlButton.qml</file>
- <file alias="NoteAdd.qml">qml/score/NoteAdd.qml</file>
- <file alias="DelControl.qml">qml/score/DelControl.qml</file>
- <file alias="ControlBase.qml">qml/score/ControlBase.qml</file>
- <file alias="Scordature.qml">qml/score/Scordature.qml</file>
+ <file alias="score/Score.qml">qml/score/Score.qml</file>
+ <file alias="score/Staff.qml">qml/score/Staff.qml</file>
+ <file alias="score/Clef.qml">qml/score/Clef.qml</file>
+ <file alias="score/ClefDrawer.qml">qml/score/ClefDrawer.qml</file>
+ <file alias="score/KeySignature.qml">qml/score/KeySignature.qml</file>
+ <file alias="score/Meter.qml">qml/score/Meter.qml</file>
+ <file alias="score/MeterDrawer.qml">qml/score/MeterDrawer.qml</file>
+ <file alias="score/Tie.qml">qml/score/Tie.qml</file>
+ <file alias="score/AddLine.qml">qml/score/AddLine.qml</file>
+ <file alias="score/NoteCursor.qml">qml/score/NoteCursor.qml</file>
+ <file alias="score/NotePrompt.qml">qml/score/NotePrompt.qml</file>
+ <file alias="score/AccidControl.qml">qml/score/AccidControl.qml</file>
+ <file alias="score/RhythmControl.qml">qml/score/RhythmControl.qml</file>
+ <file alias="score/ControlButton.qml">qml/score/ControlButton.qml</file>
+ <file alias="score/NoteAdd.qml">qml/score/NoteAdd.qml</file>
+ <file alias="score/DelControl.qml">qml/score/DelControl.qml</file>
+ <file alias="score/ControlBase.qml">qml/score/ControlBase.qml</file>
+ <file alias="score/Scordature.qml">qml/score/Scordature.qml</file>
<file alias="Instrument.qml">qml/instruments/Instrument.qml</file>
<file alias="instruments/Guitar.qml">qml/instruments/Guitar.qml</file>
diff --git a/src/qml/MainScore.qml b/src/qml/MainScore.qml
index eed1545a9..bd486dd6a 100644
--- a/src/qml/MainScore.qml
+++ b/src/qml/MainScore.qml
@@ -8,6 +8,7 @@ import QtQuick.Controls 2.2
import Score 1.0
import Nootka 1.0
import Nootka.Main 1.0
+import "score"
Score {
diff --git a/src/qml/instruments/Instrument.qml b/src/qml/instruments/Instrument.qml
index 8fa85cdbe..ce5b34cbb 100644
--- a/src/qml/instruments/Instrument.qml
+++ b/src/qml/instruments/Instrument.qml
@@ -5,6 +5,7 @@
import QtQuick 2.9
import Nootka 1.0
+import "score"
Item {
diff --git a/src/qml/level/MelodyPage.qml b/src/qml/level/MelodyPage.qml
index 384cbc81d..723434a23 100644
--- a/src/qml/level/MelodyPage.qml
+++ b/src/qml/level/MelodyPage.qml
@@ -1,5 +1,5 @@
/** This file is part of Nootka (http://nootka.sf.net) *
- * Copyright (C) 2017 by Tomasz Bojczuk (seelook@gmail.com) *
+ * Copyright (C) 2017-2018 by Tomasz Bojczuk (seelook@gmail.com) *
* on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */
import QtQuick 2.9
@@ -7,6 +7,7 @@ import QtQuick.Controls 2.2
import Score 1.0
import "../"
+import "../score"
Tflickable {
diff --git a/src/qml/level/RangePage.qml b/src/qml/level/RangePage.qml
index c04355c73..d26583491 100644
--- a/src/qml/level/RangePage.qml
+++ b/src/qml/level/RangePage.qml
@@ -1,5 +1,5 @@
/** This file is part of Nootka (http://nootka.sf.net) *
- * Copyright (C) 2017 by Tomasz Bojczuk (seelook@gmail.com) *
+ * Copyright (C) 2017-2018 by Tomasz Bojczuk (seelook@gmail.com) *
* on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */
import QtQuick 2.9
@@ -7,6 +7,7 @@ import QtQuick.Controls 2.2
import Score 1.0
import "../"
+import "../score"
Flickable {
diff --git a/src/qml/score/Clef.qml b/src/qml/score/Clef.qml
index 882576630..da0343051 100644
--- a/src/qml/score/Clef.qml
+++ b/src/qml/score/Clef.qml
@@ -1,5 +1,5 @@
/** This file is part of Nootka (http://nootka.sf.net) *
- * Copyright (C) 2017 by Tomasz Bojczuk (seelook@gmail.com) *
+ * Copyright (C) 2017-2018 by Tomasz Bojczuk (seelook@gmail.com) *
* on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */
import QtQuick 2.9
@@ -35,7 +35,7 @@ Text {
if (clefDrawer)
clefDrawer.open()
else {
- var c = Qt.createComponent("qrc:/ClefDrawer.qml")
+ var c = Qt.createComponent("qrc:/score/ClefDrawer.qml")
clefDrawer = c.createObject(clef)
}
clefDrawer.selectedClef = score.clef
diff --git a/src/qml/score/ClefDrawer.qml b/src/qml/score/ClefDrawer.qml
index 95cdada8a..30d738462 100644
--- a/src/qml/score/ClefDrawer.qml
+++ b/src/qml/score/ClefDrawer.qml
@@ -1,10 +1,11 @@
/** This file is part of Nootka (http://nootka.sf.net) *
- * Copyright (C) 2017 by Tomasz Bojczuk (seelook@gmail.com) *
+ * Copyright (C) 2017-2018 by Tomasz Bojczuk (seelook@gmail.com) *
* on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */
import QtQuick 2.9
import QtQuick.Controls 2.2
+import "../"
Drawer {
property alias selectedClef: clefMenu.selClef
diff --git a/src/qml/score/ControlBase.qml b/src/qml/score/ControlBase.qml
index 5a26b3c43..f9bd650cd 100644
--- a/src/qml/score/ControlBase.qml
+++ b/src/qml/score/ControlBase.qml
@@ -1,10 +1,12 @@
/** This file is part of Nootka (http://nootka.sf.net) *
- * Copyright (C) 2017 by Tomasz Bojczuk (seelook@gmail.com) *
+ * Copyright (C) 2017-2018 by Tomasz Bojczuk (seelook@gmail.com) *
* on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */
import QtQuick 2.9
import QtQuick.Window 2.2
+import "../"
+
TipRect {
id: base
diff --git a/src/qml/score/Meter.qml b/src/qml/score/Meter.qml
index dde27cd4c..ffcb24860 100644
--- a/src/qml/score/Meter.qml
+++ b/src/qml/score/Meter.qml
@@ -1,5 +1,5 @@
/** This file is part of Nootka (http://nootka.sf.net) *
- * Copyright (C) 2017 by Tomasz Bojczuk (seelook@gmail.com) *
+ * Copyright (C) 2017-2018 by Tomasz Bojczuk (seelook@gmail.com) *
* on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */
import QtQuick 2.9
@@ -41,7 +41,7 @@ Text {
if (meterDrawer)
meterDrawer.open()
else {
- var c = Qt.createComponent("qrc:/MeterDrawer.qml")
+ var c = Qt.createComponent("qrc:/score/MeterDrawer.qml")
meterDrawer = c.createObject(meter)
}
}
diff --git a/src/qml/score/MeterDrawer.qml b/src/qml/score/MeterDrawer.qml
index 2598e976f..19c14d82c 100644
--- a/src/qml/score/MeterDrawer.qml
+++ b/src/qml/score/MeterDrawer.qml
@@ -1,18 +1,19 @@
/** This file is part of Nootka (http://nootka.sf.net) *
- * Copyright (C) 2017 by Tomasz Bojczuk (seelook@gmail.com) *
+ * Copyright (C) 2017-2018 by Tomasz Bojczuk (seelook@gmail.com) *
* on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */
import QtQuick 2.9
import QtQuick.Controls 2.2
import Score 1.0
+import "../"
Drawer { // meter menu
visible: true
width: nootkaWindow.width / 4; height: nootkaWindow.height
background: Rectangle { color: activPal.window }
-
+
Flickable {
anchors.fill: parent
clip: true
@@ -23,7 +24,7 @@ Drawer { // meter menu
topPadding: Noo.fontSize() / 2
columns: 2
spacing: Noo.fontSize() / 2
-
+
Repeater {
model: 12
TcuteButton {
diff --git a/src/qml/score/NoteCursor.qml b/src/qml/score/NoteCursor.qml
index 1e69ae6a7..8f923f574 100644
--- a/src/qml/score/NoteCursor.qml
+++ b/src/qml/score/NoteCursor.qml
@@ -80,7 +80,7 @@ Item {
}
Repeater { // lower lines
model: (score.firstStaff.height - score.upperLine - 12) / 2
- AddLine {
+ AddLine {
y: score.upperLine + (score.clef === Tclef.PianoStaffClefs ? 22 : 10) + 2 * index - 0.1
visible: score.upperLine + (score.clef === Tclef.PianoStaffClefs ? 22 : 10) + index * 2 <= yPos
}
diff --git a/src/qml/score/Score.qml b/src/qml/score/Score.qml
index 64471291f..2f815e68e 100644
--- a/src/qml/score/Score.qml
+++ b/src/qml/score/Score.qml
@@ -52,7 +52,7 @@ Flickable {
onClicked: currentNote = scoreObj.activeNote
onStaffCreate: {
- var c = Qt.createComponent("qrc:/Staff.qml")
+ var c = Qt.createComponent("qrc:/score/Staff.qml")
var lastStaff = c.createObject(score.contentItem)
staves.push(lastStaff)
score.lastStaff = lastStaff
@@ -80,19 +80,19 @@ Flickable {
onAllowAddingChanged: {
if (allowAdding) {
if (!delControl) {
- var c = Qt.createComponent("qrc:/DelControl.qml")
+ var c = Qt.createComponent("qrc:/score/DelControl.qml")
delControl = c.createObject(contentItem)
delControl.active = Qt.binding(function() { return !readOnly && scoreObj.activeNote !== null && scoreObj.activeNote === scoreObj.lastNote })
}
if (!noteAdd) {
- var c = Qt.createComponent("qrc:/NoteAdd.qml")
+ var c = Qt.createComponent("qrc:/score/NoteAdd.qml")
noteAdd = c.createObject(contentItem)
}
}
}
onActiveNoteChanged: {
if (!cursor) {
- var c = Qt.createComponent("qrc:/NoteCursor.qml")
+ var c = Qt.createComponent("qrc:/score/NoteCursor.qml")
cursor = c.createObject(contentItem)
cursor.parent = Qt.binding(function() { return scoreObj.activeNote })
}
diff --git a/src/qml/score/Staff.qml b/src/qml/score/Staff.qml
index 677dbc9de..f744f62cc 100644
--- a/src/qml/score/Staff.qml
+++ b/src/qml/score/Staff.qml
@@ -80,7 +80,7 @@ TstaffItem {
function checkIsKeyEnabled() { // key signature created on demand
if (score.enableKeySign) {
if (!keySignItem) {
- var c = Qt.createComponent("qrc:/KeySignature.qml")
+ var c = Qt.createComponent("qrc:/score/KeySignature.qml")
keySignItem = c.createObject(staff)
}
} else {
diff --git a/src/qml/settings/InstrumentPage.qml b/src/qml/settings/InstrumentPage.qml
index ec6cad5f0..07a6eb9bb 100644
--- a/src/qml/settings/InstrumentPage.qml
+++ b/src/qml/settings/InstrumentPage.qml
@@ -8,6 +8,7 @@ import QtQuick.Controls 2.2
import Score 1.0
import Nootka 1.0
import "../"
+import "../score"
Flickable {
diff --git a/src/qml/wizard/WizardClef.qml b/src/qml/wizard/WizardClef.qml
index aec0e5454..8f3f7724d 100644
--- a/src/qml/wizard/WizardClef.qml
+++ b/src/qml/wizard/WizardClef.qml
@@ -1,5 +1,5 @@
/** This file is part of Nootka (http://nootka.sf.net) *
- * Copyright (C) 2017 by Tomasz Bojczuk (seelook@gmail.com) *
+ * Copyright (C) 2017-2018 by Tomasz Bojczuk (seelook@gmail.com) *
* on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */
import QtQuick 2.9
@@ -7,6 +7,7 @@ import QtQuick.Controls 2.2
import Score 1.0
import "../"
+import "../score"
Flickable {
--
GitLab