Manually merge convergence branch
fdb01a55dc51
Actions

Authored by sandroandrade on Nov 17 2016, 11:01 PM.

Description

Manually merge convergence branch

Details

Committed

sandroandrade

Nov 17 2016, 11:01 PM

Parents

R163:7d47bb63dfcc: SVN_SILENT made messages (.desktop file) - always resolve ours

Branches

Unknown

Tags

Unknown

sandroandrade committed R163:fdb01a55dc51: Manually merge convergence branch (authored by sandroandrade).Nov 17 2016, 11:01 PM

sandroandrade mentioned this in D2716: Add Windows support..Feb 3 2017, 12:23 AM

Changes (179)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		.gitignore
M		CMakeLists.txt
M		Messages.sh
M		README
D		README.packagers
A	(dir)	android/
A		android/AndroidManifest.xml
A	(dir)	android/res/
A	(dir)	android/res/drawable-hdpi/
A		android/res/drawable-hdpi/minuet.png
A		android/res/drawable-hdpi/splash.9.png
A	(dir)	android/res/drawable-ldpi/
A		android/res/drawable-ldpi/minuet.png
A		android/res/drawable-ldpi/splash.9.png
A	(dir)	android/res/drawable-mdpi/
A		android/res/drawable-mdpi/minuet.png
A		android/res/drawable-mdpi/splash.9.png
A	(dir)	android/res/drawable-xhdpi/
A		android/res/drawable-xhdpi/minuet.png
A		android/res/drawable-xhdpi/splash.9.png
A	(dir)	android/res/drawable-xxhdpi/
A		android/res/drawable-xxhdpi/minuet.png
A		android/res/drawable-xxhdpi/splash.9.png
A	(dir)	android/res/drawable-xxxhdpi/
A		android/res/drawable-xxxhdpi/minuet.png
A		android/res/drawable-xxxhdpi/splash.9.png
A	(dir)	android/res/values/
A		android/res/values/MinuetTheme.xml
A		build-android.sh
M		data/CMakeLists.txt
A		deploy-android.sh
D		doc
D		doc/CMakeLists.txt
D		doc/configuration-wizard.png
D		doc/index.docbook
D		doc/minuet-configuration.png
D		doc/minuet-screenshot.png
D		doc/minuet-ui-components.png
D		doc/minuet-ui-components.svg
D		doc/multimedia-pause.png
D		doc/multimedia-pitch.png
D		doc/multimedia-play.png
D		doc/multimedia-speed.png
D		doc/multimedia-stop.png
D		doc/multimedia-volume.png
D		icons
V		{ → src/app}/icons/16-actions-minuet-chords.svg
V		{ → src/app}/icons/16-actions-minuet-intervals.svg
V		{ → src/app}/icons/16-actions-minuet-rhythms.svg
V		{ → src/app}/icons/16-actions-minuet-scales.svg
V		{ → src/app}/icons/16-apps-minuet.png
V		{ → src/app}/icons/16-apps-minuet.svg
V		{ → src/app}/icons/22-actions-minuet-chords.svg
V		{ → src/app}/icons/22-actions-minuet-intervals.svg
V		{ → src/app}/icons/22-actions-minuet-rhythms.svg
V		{ → src/app}/icons/22-actions-minuet-scales.svg
V		{ → src/app}/icons/22-apps-minuet.png
V		{ → src/app}/icons/22-apps-minuet.svg
V		{ → src/app}/icons/32-apps-minuet.png
V		{ → src/app}/icons/32-apps-minuet.svg
V		{ → src/app}/icons/48-apps-minuet.png
V		{ → src/app}/icons/48-apps-minuet.svg
V		{ → src/app}/icons/64-apps-minuet.png
P		icons/64-apps-minuet.svg Deleted after being copied to multiple locations: src/app/icons/128-apps-minuet.svg src/app/icons/64-apps-minuet.svg
D		icons/CMakeLists.txt
V		{ → src/app}/icons/sc-apps-minuet.svgz
M		org.kde.minuet.appdata.xml
A		set-android-env.sh
A	(dir)	src/app/+android/
A	(dir)	src/app/+android/qml/
P		src/app/+android/qml/MinuetMenuContainer.qml Copied from src/interfaces/iplugin.cpp
A		src/app/+android/qtquickcontrols2.conf
A	(dir)	src/app/+windows/
A		src/app/+windows/qtquickcontrols2.conf
M		src/app/CMakeLists.txt
M		src/app/core.cpp
M		src/app/core.h
M		src/app/exercisecontroller.cpp
A	(dir)	src/app/icons/
A		src/app/icons/128-apps-minuet.png
P		src/app/icons/128-apps-minuet.svg Copied from icons/64-apps-minuet.svg
V		{src/app ← }/icons/16-actions-minuet-chords.svg
V		{src/app ← }/icons/16-actions-minuet-intervals.svg
V		{src/app ← }/icons/16-actions-minuet-rhythms.svg
V		{src/app ← }/icons/16-actions-minuet-scales.svg
V		{src/app ← }/icons/16-apps-minuet.png
V		{src/app ← }/icons/16-apps-minuet.svg
V		{src/app ← }/icons/22-actions-minuet-chords.svg
V		{src/app ← }/icons/22-actions-minuet-intervals.svg
V		{src/app ← }/icons/22-actions-minuet-rhythms.svg
V		{src/app ← }/icons/22-actions-minuet-scales.svg
V		{src/app ← }/icons/22-apps-minuet.png
V		{src/app ← }/icons/22-apps-minuet.svg
V		{src/app ← }/icons/32-apps-minuet.png
V		{src/app ← }/icons/32-apps-minuet.svg
V		{src/app ← }/icons/48-apps-minuet.png
V		{src/app ← }/icons/48-apps-minuet.svg
V		{src/app ← }/icons/64-apps-minuet.png
V		{src/app ← }/icons/64-apps-minuet.svg
V		{src/app ← }/icons/sc-apps-minuet.svgz
M		src/app/main.cpp
D		src/app/mainwindow.cpp
D		src/app/mainwindow.h
D		src/app/minuetsettings.kcfg
D		src/app/minuetsettings.kcfgc
D		src/app/minuetui.rc
M		src/app/org.kde.minuet.desktop
M		src/app/plugincontroller.cpp
M		src/app/plugincontroller.h
A		src/app/qml.qrc
A		src/app/qml/AboutDialog.qml
M		src/app/qml/ExerciseView.qml
A		src/app/qml/ImageItemDelegate.qml
M		src/app/qml/Main.qml
M		src/app/qml/MinuetMenu.qml
P		src/app/qml/MinuetMenuContainer.qml Copied from src/interfaces/iplugin.cpp
A	(dir)	src/app/qml/PianoView/
V		src/app/qml/{PianoView ← pianoview}/BlackKey.qml
V		src/app/qml/{PianoView ← pianoview}/Octave.qml
A		src/app/qml/PianoView/PianoView.qml
V		src/app/qml/{PianoView ← pianoview}/WhiteKey.qml
D		src/app/qml/RhythmAnswerView.qml
A		src/app/qml/images/keyboard_arrow_left.png
A		src/app/qml/images/menu.png
M		src/app/qml/images/minuet-background.png
M		src/app/qml/images/minuet-background.svg
A		src/app/qml/images/minuet-drawer.png
A		src/app/qml/images/more_vert.png
D		src/app/qml/images/multimedia-pause.png
D		src/app/qml/images/multimedia-pitch.png
D		src/app/qml/images/multimedia-play.png
D		src/app/qml/images/multimedia-speed.png
D		src/app/qml/images/multimedia-stop.png
D		src/app/qml/images/multimedia-volume.png
D		src/app/qml/images/navigate-next.png
D		src/app/qml/midiplayer
D		src/app/qml/midiplayer/MidiPlayer.qml
D		src/app/qml/midiplayer/MultimediaButton.qml
D		src/app/qml/midiplayer/MultimediaSlider.qml
D		src/app/qml/pianoview
V		src/app/qml/{pianoview → PianoView}/BlackKey.qml
V		src/app/qml/{pianoview → PianoView}/Octave.qml
D		src/app/qml/pianoview/PianoView.qml
V		src/app/qml/{pianoview → PianoView}/WhiteKey.qml
A		src/app/qtquickcontrols2.conf
D		src/app/settingsmidi.ui
M		src/app/uicontroller.cpp
M		src/app/uicontroller.h
M		src/interfaces/CMakeLists.txt
M		src/interfaces/icore.h
M		src/interfaces/iexercisecontroller.h
P		src/interfaces/iplugin.cpp Copied to multiple locations: src/app/+android/qml/MinuetMenuContainer.qml src/app/qml/MinuetMenuContainer.qml src/plugins/csoundsoundcontroller/csengine.cpp src/plugins/csoundsoundcontroller/csengine.h
M		src/interfaces/iplugin.h
M		src/interfaces/iplugincontroller.h
V		src/interfaces/{isoundbackend.cpp → isoundcontroller.cpp}
V		src/interfaces/{isoundbackend.h → isoundcontroller.h}
V		src/interfaces/{isoundcontroller.cpp ← isoundbackend.cpp}
V		src/interfaces/{isoundcontroller.h ← isoundbackend.h}
M		src/interfaces/iuicontroller.h
M		src/plugins/CMakeLists.txt
A	(dir)	src/plugins/csoundsoundcontroller/
A		src/plugins/csoundsoundcontroller/CMakeLists.txt
P		src/plugins/csoundsoundcontroller/csengine.cpp Copied from src/interfaces/iplugin.cpp
P		src/plugins/csoundsoundcontroller/csengine.h Copied from src/interfaces/iplugin.cpp
A		src/plugins/csoundsoundcontroller/csoundsoundcontroller.cpp
P		src/plugins/csoundsoundcontroller/csoundsoundcontroller.h Copied from src/plugins/fluidsynthsoundbackend/fluidsynthsoundbackend.h
A		src/plugins/csoundsoundcontroller/csoundsoundcontroller.json
D		src/plugins/fluidsynthsoundbackend
D		src/plugins/fluidsynthsoundbackend/CMakeLists.txt
V		src/plugins/{fluidsynthsoundbackend → fluidsynthsoundcontroller}/GeneralUser-v1.47.sf2
V		src/plugins/{fluidsynthsoundbackend/fluidsynthsoundbackend.cpp → fluidsynthsoundcontroller/fluidsynthsoundcontroller.cpp}
P		src/plugins/fluidsynthsoundbackend/fluidsynthsoundbackend.h Deleted after being copied to multiple locations: src/plugins/csoundsoundcontroller/csoundsoundcontroller.h src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.h
V		src/plugins/{fluidsynthsoundbackend/fluidsynthsoundbackend.json → fluidsynthsoundcontroller/fluidsynthsoundcontroller.json}
A	(dir)	src/plugins/fluidsynthsoundcontroller/
A		src/plugins/fluidsynthsoundcontroller/CMakeLists.txt
V		src/plugins/{fluidsynthsoundcontroller ← fluidsynthsoundbackend}/GeneralUser-v1.47.sf2
V		src/plugins/{fluidsynthsoundcontroller/fluidsynthsoundcontroller.cpp ← fluidsynthsoundbackend/fluidsynthsoundbackend.cpp}
V		src/plugins/{fluidsynthsoundcontroller/fluidsynthsoundcontroller.h ← fluidsynthsoundbackend/fluidsynthsoundbackend.h}
V		src/plugins/{fluidsynthsoundcontroller/fluidsynthsoundcontroller.json ← fluidsynthsoundbackend/fluidsynthsoundbackend.json}