Commit 7b09849f authored by Sandro Andrade's avatar Sandro Andrade

Merge branch 'Applications/17.04'

parents b74b5400 db5f5c1e
......@@ -9,7 +9,7 @@ set (KDE_APPLICATIONS_VERSION_MAJOR "17")
set (KDE_APPLICATIONS_VERSION_MINOR "07")
set (KDE_APPLICATIONS_VERSION_MICRO "70")
#set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
set (KDE_APPLICATIONS_VERSION "0.3.70")
set (KDE_APPLICATIONS_VERSION "0.4.0")
set(ECM_MIN_VERSION "5.15.0")
set(QT_MIN_VERSION "5.7.0")
......
set(minuet_DEFINITIONS
intervals-ascending-melodic-definitions.json
intervals-ascending-melodic-harmonic-definitions.json
intervals-descending-melodic-definitions.json
chords-root-position-definitions.json
scales-major-and-its-modes-definitions.json
scales-harmonic-minor-and-its-modes-definitions.json
scales-harmonic-major-and-its-modes-definitions.json
scales-pentatonic-major-and-its-modes-definitions.json
scales-simmetric-definitions.json
scales-bebop-definitions.json
rhythm-definitions.json
)
......
{
"definitions": [
{
"tags": ["interval", "ascending", "2", "minor"],
"tags": ["interval", "ascending", "harmonic", "2", "minor"],
"name": "Minor Second",
"sequence": "1"
},
{
"tags": ["interval", "ascending", "2", "major"],
"tags": ["interval", "ascending", "harmonic", "2", "major"],
"name": "Major Second",
"sequence": "2"
},
{
"tags": ["interval", "ascending", "3", "minor"],
"tags": ["interval", "ascending", "harmonic", "3", "minor"],
"name": "Minor Third",
"sequence": "3"
},
{
"tags": ["interval", "ascending", "3", "major"],
"tags": ["interval", "ascending", "harmonic", "3", "major"],
"name": "Major Third",
"sequence": "4"
},
{
"tags": ["interval", "ascending", "4"],
"tags": ["interval", "ascending", "harmonic", "4"],
"name": "Perfect Fourth",
"sequence": "5"
},
{
"tags": ["interval", "ascending", "tritone"],
"tags": ["interval", "ascending", "harmonic", "tritone"],
"name": "Tritone",
"sequence": "6"
},
{
"tags": ["interval", "ascending", "5"],
"tags": ["interval", "ascending", "harmonic", "5"],
"name": "Perfect Fifth",
"sequence": "7"
},
{
"tags": ["interval", "ascending", "6", "minor"],
"tags": ["interval", "ascending", "harmonic", "6", "minor"],
"name": "Minor Sixth",
"sequence": "8"
},
{
"tags": ["interval", "ascending", "6", "major"],
"tags": ["interval", "ascending", "harmonic", "6", "major"],
"name": "Major Sixth",
"sequence": "9"
},
{
"tags": ["interval", "ascending", "7", "minor"],
"tags": ["interval", "ascending", "harmonic", "7", "minor"],
"name": "Minor Seventh",
"sequence": "10"
},
{
"tags": ["interval", "ascending", "7", "major"],
"tags": ["interval", "ascending", "harmonic", "7", "major"],
"name": "Major Seventh",
"sequence": "11"
},
{
"tags": ["interval", "ascending", "8"],
"tags": ["interval", "ascending", "harmonic", "8"],
"name": "Perfect Octave",
"sequence": "12"
},
{
"tags": ["interval", "ascending", "9", "minor"],
"tags": ["interval", "ascending", "harmonic", "9", "minor"],
"name": "Minor Ninth",
"sequence": "13"
},
{
"tags": ["interval", "ascending", "9", "major"],
"tags": ["interval", "ascending", "harmonic", "9", "major"],
"name": "Major Ninth",
"sequence": "14"
},
{
"tags": ["interval", "ascending", "10", "minor"],
"tags": ["interval", "ascending", "harmonic", "10", "minor"],
"name": "Minor Tenth",
"sequence": "15"
},
{
"tags": ["interval", "ascending", "10", "major"],
"tags": ["interval", "ascending", "harmonic", "10", "major"],
"name": "Major Tenth",
"sequence": "16"
},
{
"tags": ["interval", "ascending", "11"],
"tags": ["interval", "ascending", "harmonic", "11"],
"name": "Perfect Eleventh",
"sequence": "17"
},
{
"tags": ["interval", "ascending", "8+tritone"],
"tags": ["interval", "ascending", "harmonic", "8+tritone"],
"name": "Octave + Tritone",
"sequence": "18"
},
{
"tags": ["interval", "ascending", "12"],
"tags": ["interval", "ascending", "harmonic", "12"],
"name": "Perfect Twelfth",
"sequence": "19"
},
{
"tags": ["interval", "ascending", "13", "minor"],
"tags": ["interval", "ascending", "harmonic", "13", "minor"],
"name": "Minor Thirteenth",
"sequence": "20"
},
{
"tags": ["interval", "ascending", "13", "major"],
"tags": ["interval", "ascending", "harmonic", "13", "major"],
"name": "Major Thirteenth",
"sequence": "21"
},
{
"tags": ["interval", "ascending", "14", "minor"],
"tags": ["interval", "ascending", "harmonic", "14", "minor"],
"name": "Minor Fourteenth",
"sequence": "22"
},
{
"tags": ["interval", "ascending", "14", "major"],
"tags": ["interval", "ascending", "harmonic", "14", "major"],
"name": "Major Fourteenth",
"sequence": "23"
},
{
"tags": ["interval", "ascending", "double8"],
"tags": ["interval", "ascending", "harmonic", "double8"],
"name": "Perfect Double Octave",
"sequence": "24"
}
......
{
"definitions": [
{
"tags": ["scale", "ascending", "bebop"],
"name": "Bebop Major",
"sequence": "2 4 5 7 8 9 11 12"
},
{
"tags": ["scale", "ascending", "bebop"],
"name": "Bebop Dominant",
"sequence": "2 4 5 7 9 10 11 12"
},
{
"tags": ["scale", "ascending", "bebop"],
"name": "Bebop Dorian",
"sequence": "2 3 4 5 7 9 10 12"
},
{
"tags": ["scale", "ascending", "bebop"],
"name": "Bebop Minor",
"sequence": "2 3 5 7 8 9 11 12"
},
{
"tags": ["scale", "ascending", "bebop"],
"name": "Bebop Locrian",
"sequence": "1 3 5 6 7 8 10 12"
}
]
}
{
"definitions": [
{
"tags": ["scale", "ascending", "major", "harmonic"],
"name": "Harmonic Major",
"sequence": "2 4 5 7 8 11 12"
},
{
"tags": ["scale", "ascending", "major", "harmonic"],
"name": "Dorian b5",
"sequence": "2 3 5 6 9 10 12"
},
{
"tags": ["scale", "ascending", "major", "harmonic"],
"name": "Phrygian b4",
"sequence": "1 3 4 7 8 10 12"
},
{
"tags": ["scale", "ascending", "major", "harmonic"],
"name": "Lydian b3",
"sequence": "2 3 6 7 9 11 12"
},
{
"tags": ["scale", "ascending", "major", "harmonic"],
"name": "Mixolydian b9",
"sequence": "1 4 5 7 9 10 12"
},
{
"tags": ["scale", "ascending", "major", "harmonic"],
"name": "Lydian #2 #5",
"sequence": "3 4 6 8 9 11 12"
},
{
"tags": ["scale", "ascending", "major", "harmonic"],
"name": "Locrian bb7",
"sequence": "1 3 5 6 8 9 12"
}
]
}
{
"definitions": [
{
"tags": ["scale", "ascending", "minor", "harmonic"],
"name": "Harmonic Minor",
"sequence": "2 3 5 7 8 11 12"
},
{
"tags": ["scale", "ascending", "minor", "harmonic"],
"name": "Locrian #6",
"sequence": "1 3 5 6 9 10 12"
},
{
"tags": ["scale", "ascending", "minor", "harmonic"],
"name": "Ionian Augmented",
"sequence": "2 4 5 8 9 11 12"
},
{
"tags": ["scale", "ascending", "minor", "harmonic"],
"name": "Romanian",
"sequence": "2 3 6 7 9 10 12"
},
{
"tags": ["scale", "ascending", "minor", "harmonic"],
"name": "Phrygian Dominant",
"sequence": "1 4 5 7 8 10 12"
},
{
"tags": ["scale", "ascending", "minor", "harmonic"],
"name": "Lydian #2",
"sequence": "3 4 6 7 9 11 12"
},
{
"tags": ["scale", "ascending", "minor", "harmonic"],
"name": "Ultralocrian",
"sequence": "1 3 4 6 8 9 12"
}
]
}
{
"definitions": [
{
"tags": ["scale", "ascending", "major"],
"tags": ["scale", "ascending", "major", "diatonic"],
"name": "Ionian",
"sequence": "2 4 5 7 9 11 12"
},
{
"tags": ["scale", "ascending", "major"],
"tags": ["scale", "ascending", "major", "diatonic"],
"name": "Dorian",
"sequence": "2 3 5 7 9 10 12"
},
{
"tags": ["scale", "ascending", "major"],
"tags": ["scale", "ascending", "major", "diatonic"],
"name": "Phrygian",
"sequence": "1 3 5 7 8 10 12"
},
{
"tags": ["scale", "ascending", "major"],
"tags": ["scale", "ascending", "major", "diatonic"],
"name": "Lydian",
"sequence": "2 4 6 7 9 11 12"
},
{
"tags": ["scale", "ascending", "major"],
"tags": ["scale", "ascending", "major", "diatonic"],
"name": "Mixolydian",
"sequence": "2 4 5 7 9 10 12"
},
{
"tags": ["scale", "ascending", "major"],
"tags": ["scale", "ascending", "major", "diatonic"],
"name": "Aeolian",
"sequence": "2 3 5 7 8 10 12"
},
{
"tags": ["scale", "ascending", "major"],
"tags": ["scale", "ascending", "major", "diatonic"],
"name": "Locrian",
"sequence": "1 3 5 6 8 10 12"
}
......
{
"definitions": [
{
"tags": ["scale", "ascending", "major", "pentatonic"],
"name": "Major Pentatonic",
"sequence": "2 4 7 9"
},
{
"tags": ["scale", "ascending", "major", "pentatonic"],
"name": "Suspended Pentatonic",
"sequence": "2 5 7 10"
},
{
"tags": ["scale", "ascending", "major", "pentatonic"],
"name": "Man Gong",
"sequence": "3 5 8 10"
},
{
"tags": ["scale", "ascending", "major", "pentatonic"],
"name": "Ritusen",
"sequence": "2 5 7 9"
},
{
"tags": ["scale", "ascending", "major", "pentatonic"],
"name": "Minor Pentatonic",
"sequence": "3 5 7 10"
}
]
}
{
"definitions": [
{
"tags": ["scale", "ascending", "simmetric"],
"name": "Diminished W-H",
"sequence": "2 3 5 6 8 9 11 12"
},
{
"tags": ["scale", "ascending", "simmetric"],
"name": "Diminished H-W",
"sequence": "1 3 4 6 7 9 10 12"
},
{
"tags": ["scale", "ascending", "simmetric"],
"name": "Whole Tone",
"sequence": "2 4 6 8 10 12"
},
{
"tags": ["scale", "ascending", "simmetric"],
"name": "Augmented",
"sequence": "3 4 7 8 11 12"
},
{
"tags": ["scale", "ascending", "simmetric"],
"name": "Augmented Inverse",
"sequence": "1 4 5 8 9 12"
}
]
}
set(minuet_EXERCISES
intervals-ascending-melodic-exercises.json
intervals-descending-melodic-exercises.json
intervals-harmonic-exercises.json
chords-root-position-exercises.json
scales-major-and-its-modes-exercises.json
scales-harmonic-minor-and-its-modes-exercises.json
scales-harmonic-major-and-its-modes-exercises.json
scales-pentatonic-major-and-its-modes-exercises.json
scales-simmetric-exercises.json
scales-bebop-exercises.json
rhythm-easy.json
rhythm-medium.json
)
......
......@@ -2,7 +2,7 @@
"exercises": [
{
"name": "Chords",
"root": "21..104",
"root": "41..67",
"playMode": "chord",
"userMessage": "Hear the chord and then choose an answer from options below",
"numberOfSelectedOptions": 1,
......
......@@ -2,7 +2,7 @@
"exercises": [
{
"name": "Intervals",
"root": "21..104",
"root": "41..67",
"playMode": "scale",
"userMessage": "Hear the interval and then choose an answer from options below",
"numberOfSelectedOptions": 1,
......
......@@ -2,7 +2,7 @@
"exercises": [
{
"name": "Intervals",
"root": "21..104",
"root": "41..67",
"playMode": "scale",
"userMessage": "Hear the interval and then choose an answer from options below",
"numberOfSelectedOptions": 1,
......
{
"exercises": [
{
"name": "Intervals",
"root": "41..67",
"playMode": "chord",
"userMessage": "Hear the interval and then choose an answer from options below",
"numberOfSelectedOptions": 1,
"_icon": "minuet-intervals.svg",
"children": [
{
"name": "Harmonic Intervals",
"and-tags": ["interval", "harmonic"],
"children": [
{
"name": "Seconds",
"or-tags": ["2"]
},
{
"name": "Thirds",
"or-tags": ["3"]
},
{
"name": "Fourths and Fifths",
"or-tags": ["4", "5"]
},
{
"name": "Sixths",
"or-tags": ["6"]
},
{
"name": "Sevenths",
"or-tags": ["7"]
},
{
"name": "Ninths",
"or-tags": ["9"]
},
{
"name": "Tenths",
"or-tags": ["10"]
},
{
"name": "Tritone and Sevenths",
"or-tags": ["tritone", "7"]
},
{
"name": "Fourths, Fifths, and Octave",
"or-tags": ["4", "5", "8"]
},
{
"name": "Seconds and Thirds",
"or-tags": ["2", "3"]
},
{
"name": "Sixths and Sevenths",
"or-tags": ["6", "7"]
},
{
"name": "Sevenths and Ninths",
"or-tags": ["7", "9"]
},
{
"name": "Second to Octave",
"or-tags": ["2", "3", "4", "tritone", "5", "6", "7", "8"]
},
{
"name": "Second to Tenth",
"or-tags": ["2", "3", "4", "tritone", "5", "6", "7", "8", "9", "10"]
},
{
"name": "Second to 15th",
"or-tags": ["2", "3", "4", "tritone", "5", "6", "7", "8", "9", "10", "11", "8+tritone", "12", "13", "14", "double8"]
}
]
}
]
}
]
}
{
"exercises": [
{
"name": "Scales",
"root": "11..67",
"playMode": "scale",
"userMessage": "Hear the scale and then choose an answer from options below",
"numberOfSelectedOptions": 1,
"_icon": "minuet-scales.svg",
"children": [
{
"name": "Bebop Scales",
"and-tags": ["scale", "bebop"]
}
]
}
]
}
{
"exercises": [
{
"name": "Scales",
"root": "41..67",
"playMode": "scale",
"userMessage": "Hear the scale and then choose an answer from options below",
"numberOfSelectedOptions": 1,
"_icon": "minuet-scales.svg",
"children": [
{
"name": "Harmonic Major Scale and its Modes",
"and-tags": ["scale", "harmonic", "major"]
}
]
}
]
}
{
"exercises": [
{
"name": "Scales",
"root": "41..67",
"playMode": "scale",
"userMessage": "Hear the scale and then choose an answer from options below",
"numberOfSelectedOptions": 1,
"_icon": "minuet-scales.svg",
"children": [
{
"name": "Harmonic Minor Scale and its Modes",
"and-tags": ["scale", "harmonic", "minor"]
}
]
}
]
}
......@@ -2,7 +2,7 @@
"exercises": [
{
"name": "Scales",
"root": "21..104",
"root": "41..67",
"playMode": "scale",
"userMessage": "Hear the scale and then choose an answer from options below",
"numberOfSelectedOptions": 1,
......@@ -10,7 +10,7 @@
"children": [
{
"name": "Major Scale and its Modes",
"and-tags": ["scale", "major"]
"and-tags": ["scale", "major", "diatonic"]
}
]
}
......