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

Use Nootka.Music import

parent 8f42e3af
Branches
No related tags found
No related merge requests found
......@@ -2,11 +2,13 @@
* Copyright (C) 2017-2021 by Tomasz Bojczuk (seelook@gmail.com) *
* on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */
import Nootka 1.0
import Nootka.Main 1.0
import QtQuick 2.12
import QtQuick.Controls 2.12
import Nootka 1.0
import Nootka.Main 1.0
import Score 1.0
import Nootka.Music
import "score"
Score {
......
......@@ -5,6 +5,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import Nootka.Music
import Nootka 1.0
import Score 1.0
......@@ -30,7 +31,7 @@ Text {
if (clefDrawer)
clefDrawer.open()
else {
clefDrawer = Qt.createComponent("qrc:/score/ClefDrawer.qml").createObject(clef)
clefDrawer = Qt.createComponent("qrc:/score/ClefDrawer.qml").createObject(nootkaWindow.contentItem)
clefDrawer.clefMenu.clicked.connect(clef.clicked)
}
clefDrawer.selectedClef = score.clef
......
......@@ -2,24 +2,33 @@
* Copyright (C) 2017-2021 by Tomasz Bojczuk (seelook@gmail.com) *
* on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */
import "../"
import Nootka 1.0
import QtQuick 2.12
import QtQuick.Controls 2.12
import Nootka 1.0
import "../"
Drawer {
property alias selectedClef: clefMenu.selClef
property alias clefMenu: clefMenu
width: NOO.factor() * 19; height: parent.height
width: NOO.factor() * 19
height: parent.height
visible: true
background: GlowRect { color: activPal.window; cornerRadius: NOO.factor() / 2; radius: 0 }
Component.onCompleted: selectedClef = score.clef
ClefMenu {
id: clefMenu
onClicked: { close(); score.clef = cl }
onClicked: cl => {
close();
score.clef = cl;
}
}
background: GlowRect {
color: activPal.window
cornerRadius: NOO.factor() / 2
radius: 0
}
Component.onCompleted: selectedClef = score.clef
}
......@@ -7,7 +7,7 @@ import QtQuick.Controls 2.12
import Nootka 1.0
import Score 1.0
import Nootka.Music
Item {
id: keySig
......
......@@ -7,7 +7,7 @@ import QtQuick.Controls 2.12
import Nootka 1.0
import Score 1.0
import Nootka.Music
Text {
id: meter
......@@ -45,7 +45,7 @@ Text {
if (meterDrawer)
meterDrawer.open()
else
meterDrawer = Qt.createComponent("qrc:/score/MeterDrawer.qml").createObject(meter)
meterDrawer = Qt.createComponent("qrc:/score/MeterDrawer.qml").createObject(nootkaWindow.contentItem)
}
}
}
......@@ -6,7 +6,7 @@ import QtQuick 2.12
import Nootka 1.0
import Score 1.0
import Nootka.Music
Item {
id: noteCursor
......
......@@ -6,7 +6,7 @@ import QtQuick 2.12
import Nootka 1.0
import Score 1.0
import Nootka.Music
ControlBase {
id: toolbox
......
......@@ -6,6 +6,7 @@ import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Window 2.12
import Nootka.Music
import Nootka 1.0
import Score 1.0
......
......@@ -7,7 +7,7 @@ import QtQuick.Controls 2.12
import Nootka 1.0
import Score 1.0
import Nootka.Music
ListView {
id: clefMenu
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment