Diffusion Minuet 7b09849f5a04

Merge branch 'Applications/17.04'
7b09849f5a04
Actions

Authored by sandroandrade on Apr 12 2017, 5:57 AM.

Description

Merge branch 'Applications/17.04'

Details

Committed

sandroandrade

Apr 12 2017, 5:57 AM

Parents

R163:db5f5c1ed89d: Fix bug in sheetmusic rendering
R163:b74b5400b9c7: SVN_SILENT made messages (.desktop file) - always resolve ours

Branches

Unknown

Tags

Unknown

sandroandrade committed R163:7b09849f5a04: Merge branch 'Applications/17.04' (authored by sandroandrade).Apr 12 2017, 5:57 AM

Merged Changes

Commit	Author	Details	Committed
db5f5c1ed89d	sandroandrade	Fix bug in sheetmusic rendering	Apr 12 2017
55091ad2598e	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 9 2017
950193ed4488	aacid	GIT_SILENT Upgrade KDE Applications version to 17.03.90.	Apr 5 2017
f6a933edb114	yurchor	Fix minor typo	Mar 24 2017
84aea391caef	sandroandrade	Remove log message	Mar 24 2017
cfa897d0eeca	sandroandrade	Render notes as block for chord exercises	Mar 24 2017
a185a2662881	sandroandrade	Add basic support for sheetmusic	Mar 24 2017
05ea2efed527	sandroandrade	Add new exercises	Mar 23 2017
775a3c3b1229	sandroandrade	Update version	Mar 21 2017
d02cdb445836	aacid	GIT_SILENT Upgrade KDE Applications version to 17.03.80.	Mar 20 2017

Changes (32)

		Path
M		CMakeLists.txt
M		data/definitions/CMakeLists.txt
V		data/definitions/{intervals-ascending-melodic-definitions.json → intervals-ascending-melodic-harmonic-definitions.json}
V		data/definitions/{intervals-ascending-melodic-harmonic-definitions.json ← intervals-ascending-melodic-definitions.json}
A		data/definitions/scales-bebop-definitions.json
A		data/definitions/scales-harmonic-major-and-its-modes-definitions.json
A		data/definitions/scales-harmonic-minor-and-its-modes-definitions.json
M		data/definitions/scales-major-and-its-modes-definitions.json
A		data/definitions/scales-pentatonic-major-and-its-modes-definitions.json
A		data/definitions/scales-simmetric-definitions.json
M		data/exercises/CMakeLists.txt
M		data/exercises/chords-root-position-exercises.json
P		data/exercises/intervals-ascending-melodic-exercises.json Copied to data/exercises/intervals-harmonic-exercises.json
M		data/exercises/intervals-descending-melodic-exercises.json
P		data/exercises/intervals-harmonic-exercises.json Copied from data/exercises/intervals-ascending-melodic-exercises.json
P		data/exercises/scales-bebop-exercises.json Copied from data/exercises/scales-major-and-its-modes-exercises.json
P		data/exercises/scales-harmonic-major-and-its-modes-exercises.json Copied from data/exercises/scales-major-and-its-modes-exercises.json
P		data/exercises/scales-harmonic-minor-and-its-modes-exercises.json Copied from data/exercises/scales-major-and-its-modes-exercises.json
P		data/exercises/scales-major-and-its-modes-exercises.json Copied to multiple locations: data/exercises/scales-bebop-exercises.json data/exercises/scales-harmonic-major-and-its-modes-exercises.json data/exercises/scales-harmonic-minor-and-its-modes-exercises.json data/exercises/scales-pentatonic-major-and-its-modes-exercises.json data/exercises/scales-simmetric-exercises.json
P		data/exercises/scales-pentatonic-major-and-its-modes-exercises.json Copied from data/exercises/scales-major-and-its-modes-exercises.json
P		data/exercises/scales-simmetric-exercises.json Copied from data/exercises/scales-major-and-its-modes-exercises.json
M		src/app/qml.qrc
M		src/app/qml/ExerciseView.qml
M		src/app/qml/PianoView/PianoView.qml
A	(dir)	src/app/qml/SheetMusicView/
A		src/app/qml/SheetMusicView/Bravura.otf
A		src/app/qml/SheetMusicView/BravuraText.qml
A		src/app/qml/SheetMusicView/Clef.qml
A		src/app/qml/SheetMusicView/Note.qml
A		src/app/qml/SheetMusicView/Score.qml
A		src/app/qml/SheetMusicView/Sequence.qml
A		src/app/qml/SheetMusicView/SheetMusicView.qml