Skip to content
Snippets Groups Projects
Commit d5f85751 authored by SeeLook's avatar SeeLook
Browse files

Approve more settings: transposition, preferred accids, clef, also in wizard...

Approve more settings: transposition, preferred accids, clef, also in wizard according to selected instrument
parent 2dbe096c
No related branches found
No related tags found
No related merge requests found
1.5.1 alpha2
- simple metronome and menu for configuring tempo, quantization, etc.
- real support for transposing instruments
1.5.0 alpha1
- added support for rhythms to the score
......
......@@ -17,6 +17,8 @@ Flickable {
contentHeight: instrCol.height + nootkaWindow.fontSize * 2
contentWidth: Math.max(width, nootkaWindow.fontSize * 35)
property bool first: true // read props first time from GLOB but when instrument changed then from its profile
ScrollBar.vertical: ScrollBar { active: !Noo.isAndroid() }
Column {
......@@ -31,7 +33,18 @@ Flickable {
id: instrSel
anchors.horizontalCenter: parent.horizontalCenter
instrument: GLOB.instrument.type
onInstrumentChanged: transp.shift = Noo.instr(instrument).transposition
onInstrumentChanged: { // load instrument profile
if (first) {
transp.shift = GLOB.transposition
prefFlatRadio.checked = GLOB.preferFlats
first = false
} else {
var ins = Noo.instr(instrument)
transp.shift = ins.transposition
prefFlatRadio.checked = ins.isSax ? true : false
prefSharpRadio.checked = ins.isSax ? false : true
}
}
}
Grid {
......@@ -138,10 +151,7 @@ Flickable {
}
}
Tile {
Transposition {
id: transp
shift: GLOB.transposition
}
Transposition { id: transp }
}
Component.onCompleted: { // to avoid declaring every property signal in Tglobals.h
showOtherPosChB.checked = GLOB.showOtherPos
......@@ -164,8 +174,7 @@ Flickable {
function defaults() {
fingerColorButt.color = Qt.rgba(1, 0, 0.5, 0.78)
selectedColorButt.color = Qt.rgba(0.2, 0.6, 1.0, 1.0)
prefSharpRadio.checked = true
instrSel.instrument = Tinstrument.ClassicalGuitar
transp.shift = 0
GLOB.showOtherPos = false
instrSel.instrument = Tinstrument.ClassicalGuitar // it will set transposition and preferred accidentals
}
}
......@@ -302,6 +302,7 @@ Column {
GLOB.seventhIsB = is7BSelector.is7B
GLOB.namesOnScore = namesOnScoreChB.checked
GLOB.nameColor = nameColorButt.color
GLOB.clefType = clefs.selClef
}
function defaults() {
......@@ -310,6 +311,7 @@ Column {
enharmNoteColor.color = Qt.rgba(0, 0.6352941176470588, 0.6352941176470588, 1)
doubleAccidsChB.checked = false
pointerColorButt.color = "pink"
clefs.selClef = Tclef.Treble_G_8down
enableKeyChB.checked = false
}
......
......@@ -89,6 +89,7 @@ ApplicationWindow {
GLOB.enableDoubleAccids = optionsPage.doubleAccids
GLOB.keySignatureEnabled - optionsPage.useKeys
GLOB.showEnharmNotes = optionsPage.enharmNames
GLOB.preferFlats = GLOB.instrument.isSax ? true : false
Qt.quit()
}
// Component.onDestruction: console.log("Wizard Bye")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment