[minuet/Applications/16.12] /: Manually merge convergence branch

Sandro S. Andrade sandroandrade at kde.org
Thu Nov 17 22:57:39 UTC 2016


Git commit 561406275f67de9567004860d00bcb9ff7174a49 by Sandro S. Andrade.
Committed on 17/11/2016 at 22:57.
Pushed by sandroandrade into branch 'Applications/16.12'.

Manually merge convergence branch

M  +1    -0    .gitignore
M  +24   -26   CMakeLists.txt
M  +2    -2    Messages.sh
M  +1    -1    README
D  +0    -5    README.packagers
A  +45   -0    android/AndroidManifest.xml
A  +-    --    android/res/drawable-hdpi/minuet.png
A  +-    --    android/res/drawable-hdpi/splash.9.png
A  +-    --    android/res/drawable-ldpi/minuet.png
A  +-    --    android/res/drawable-ldpi/splash.9.png
A  +-    --    android/res/drawable-mdpi/minuet.png
A  +-    --    android/res/drawable-mdpi/splash.9.png
A  +-    --    android/res/drawable-xhdpi/minuet.png
A  +-    --    android/res/drawable-xhdpi/splash.9.png
A  +-    --    android/res/drawable-xxhdpi/minuet.png
A  +-    --    android/res/drawable-xxhdpi/splash.9.png
A  +-    --    android/res/drawable-xxxhdpi/minuet.png
A  +-    --    android/res/drawable-xxxhdpi/splash.9.png
A  +7    -0    android/res/values/MinuetTheme.xml
A  +12   -0    build-android.sh
M  +0    -2    data/CMakeLists.txt
A  +3    -0    deploy-android.sh
D  +0    -1    doc/CMakeLists.txt
D  +-    --    doc/configuration-wizard.png
D  +0    -335  doc/index.docbook
D  +-    --    doc/minuet-configuration.png
D  +-    --    doc/minuet-screenshot.png
D  +-    --    doc/minuet-ui-components.png
D  +0    -2112 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  +0    -18   icons/CMakeLists.txt
M  +0    -10   org.kde.minuet.appdata.xml
A  +8    -0    set-android-env.sh
C  +5    -15   src/app/+android/qml/MinuetMenuContainer.qml [from: src/interfaces/iplugin.cpp - 086% similarity]
A  +7    -0    src/app/+android/qtquickcontrols2.conf
A  +7    -0    src/app/+windows/qtquickcontrols2.conf
M  +56   -19   src/app/CMakeLists.txt
M  +8    -8    src/app/core.cpp
M  +4    -4    src/app/core.h
M  +17   -4    src/app/exercisecontroller.cpp
A  +-    --    src/app/icons/128-apps-minuet.png
C  +219  -212  src/app/icons/128-apps-minuet.svg [from: icons/64-apps-minuet.svg - 057% similarity]
R  +0    -0    src/app/icons/16-actions-minuet-chords.svg [from: icons/16-actions-minuet-chords.svg - 100% similarity]
R  +0    -0    src/app/icons/16-actions-minuet-intervals.svg [from: icons/16-actions-minuet-intervals.svg - 100% similarity]
R  +0    -0    src/app/icons/16-actions-minuet-rhythms.svg [from: icons/16-actions-minuet-rhythms.svg - 100% similarity]
R  +0    -0    src/app/icons/16-actions-minuet-scales.svg [from: icons/16-actions-minuet-scales.svg - 100% similarity]
R  +-    --    src/app/icons/16-apps-minuet.png [from: icons/16-apps-minuet.png - 100% similarity]
R  +0    -0    src/app/icons/16-apps-minuet.svg [from: icons/16-apps-minuet.svg - 100% similarity]
R  +0    -0    src/app/icons/22-actions-minuet-chords.svg [from: icons/22-actions-minuet-chords.svg - 100% similarity]
R  +0    -0    src/app/icons/22-actions-minuet-intervals.svg [from: icons/22-actions-minuet-intervals.svg - 100% similarity]
R  +0    -0    src/app/icons/22-actions-minuet-rhythms.svg [from: icons/22-actions-minuet-rhythms.svg - 100% similarity]
R  +0    -0    src/app/icons/22-actions-minuet-scales.svg [from: icons/22-actions-minuet-scales.svg - 100% similarity]
R  +-    --    src/app/icons/22-apps-minuet.png [from: icons/22-apps-minuet.png - 100% similarity]
R  +0    -0    src/app/icons/22-apps-minuet.svg [from: icons/22-apps-minuet.svg - 100% similarity]
R  +-    --    src/app/icons/32-apps-minuet.png [from: icons/32-apps-minuet.png - 100% similarity]
R  +0    -0    src/app/icons/32-apps-minuet.svg [from: icons/32-apps-minuet.svg - 100% similarity]
R  +-    --    src/app/icons/48-apps-minuet.png [from: icons/48-apps-minuet.png - 100% similarity]
R  +0    -0    src/app/icons/48-apps-minuet.svg [from: icons/48-apps-minuet.svg - 100% similarity]
R  +-    --    src/app/icons/64-apps-minuet.png [from: icons/64-apps-minuet.png - 100% similarity]
R  +0    -0    src/app/icons/64-apps-minuet.svg [from: icons/64-apps-minuet.svg - 100% similarity]
R  +0    -0    src/app/icons/sc-apps-minuet.svgz [from: icons/sc-apps-minuet.svgz - 100% similarity]
M  +20   -12   src/app/main.cpp
D  +0    -90   src/app/mainwindow.cpp
D  +0    -80   src/app/mainwindow.h
D  +0    -18   src/app/minuetsettings.kcfg
D  +0    -5    src/app/minuetsettings.kcfgc
D  +0    -12   src/app/minuetui.rc
M  +0    -6    src/app/org.kde.minuet.desktop
M  +23   -6    src/app/plugincontroller.cpp
M  +4    -0    src/app/plugincontroller.h
A  +44   -0    src/app/qml.qrc
A  +97   -0    src/app/qml/AboutDialog.qml     [License: GPL (v2/3)]
M  +212  -187  src/app/qml/ExerciseView.qml
A  +73   -0    src/app/qml/ImageItemDelegate.qml     [License: GPL (v2/3)]
M  +148  -81   src/app/qml/Main.qml
M  +74   -70   src/app/qml/MinuetMenu.qml
C  +6    -15   src/app/qml/MinuetMenuContainer.qml [from: src/interfaces/iplugin.cpp - 087% similarity]
R  +3    -5    src/app/qml/PianoView/BlackKey.qml [from: src/app/qml/pianoview/BlackKey.qml - 083% similarity]
R  +1    -1    src/app/qml/PianoView/Octave.qml [from: src/app/qml/pianoview/Octave.qml - 097% similarity]
A  +144  -0    src/app/qml/PianoView/PianoView.qml     [License: GPL (v2/3)]
R  +1    -3    src/app/qml/PianoView/WhiteKey.qml [from: src/app/qml/pianoview/WhiteKey.qml - 092% similarity]
D  +0    -176  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  +1508 -1508 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  +0    -142  src/app/qml/midiplayer/MidiPlayer.qml
D  +0    -51   src/app/qml/midiplayer/MultimediaButton.qml
D  +0    -63   src/app/qml/midiplayer/MultimediaSlider.qml
D  +0    -108  src/app/qml/pianoview/PianoView.qml
A  +2    -0    src/app/qtquickcontrols2.conf
D  +0    -91   src/app/settingsmidi.ui
M  +4    -4    src/app/uicontroller.cpp
M  +0    -5    src/app/uicontroller.h
M  +26   -24   src/interfaces/CMakeLists.txt
M  +5    -5    src/interfaces/icore.h
M  +1    -1    src/interfaces/iexercisecontroller.h
M  +1    -1    src/interfaces/iplugin.cpp
M  +2    -2    src/interfaces/iplugin.h
M  +2    -2    src/interfaces/iplugincontroller.h
R  +9    -9    src/interfaces/isoundcontroller.cpp [from: src/interfaces/isoundbackend.cpp - 073% similarity]
R  +8    -8    src/interfaces/isoundcontroller.h [from: src/interfaces/isoundbackend.h - 087% similarity]
M  +2    -2    src/interfaces/iuicontroller.h
M  +22   -17   src/plugins/CMakeLists.txt
A  +30   -0    src/plugins/csoundsoundcontroller/CMakeLists.txt
C  +19   -9    src/plugins/csoundsoundcontroller/csengine.cpp [from: src/interfaces/iplugin.cpp - 072% similarity]
C  +15   -12   src/plugins/csoundsoundcontroller/csengine.h [from: src/interfaces/iplugin.cpp - 079% similarity]
A  +210  -0    src/plugins/csoundsoundcontroller/csoundsoundcontroller.cpp     [License: GPL (v2/3)]
C  +18   -27   src/plugins/csoundsoundcontroller/csoundsoundcontroller.h [from: src/plugins/fluidsynthsoundbackend/fluidsynthsoundbackend.h - 057% similarity]
A  +13   -0    src/plugins/csoundsoundcontroller/csoundsoundcontroller.json
D  +0    -14   src/plugins/fluidsynthsoundbackend/CMakeLists.txt
A  +16   -0    src/plugins/fluidsynthsoundcontroller/CMakeLists.txt
R  +-    --    src/plugins/fluidsynthsoundcontroller/GeneralUser-v1.47.sf2 [from: src/plugins/fluidsynthsoundbackend/GeneralUser-v1.47.sf2 - 100% similarity]
R  +34   -26   src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.cpp [from: src/plugins/fluidsynthsoundbackend/fluidsynthsoundbackend.cpp - 077% similarity]
R  +8    -8    src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.h [from: src/plugins/fluidsynthsoundbackend/fluidsynthsoundbackend.h - 085% similarity]
R  +12   -16   src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.json [from: src/plugins/fluidsynthsoundbackend/fluidsynthsoundbackend.json - 069% similarity]

http://commits.kde.org/minuet/561406275f67de9567004860d00bcb9ff7174a49


More information about the kde-doc-english mailing list