[minuet/convergence] /: Initial work on codebase convergence

Sandro S. Andrade sandroandrade at kde.org
Sat Nov 12 08:34:01 UTC 2016


Git commit 06f72af29365938a544c93b4fb428a0ae2297c71 by Sandro S. Andrade.
Committed on 12/11/2016 at 08:33.
Pushed by sandroandrade into branch 'convergence'.

Initial work on codebase convergence

M  +9    -54   CMakeLists.txt
D  +0    -6    README.packagers
A  +81   -0    android/AndroidManifest.xml
R  +2    -2    build-android.sh [from: minuetandroid/build.sh - 078% similarity]
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    -11   exercises/CMakeLists.txt
D  +0    -288  exercises/chords-root-position.json
D  +-    --    exercises/exercise-images/current-rhythm.png
D  +-    --    exercises/exercise-images/eighth-dot-sixteenth.png
D  +-    --    exercises/exercise-images/eighth-eighth.png
D  +-    --    exercises/exercise-images/eighth-sixteenth-sixteenth.png
D  +-    --    exercises/exercise-images/quarter.png
D  +-    --    exercises/exercise-images/sixteenth-eighth-dot.png
D  +-    --    exercises/exercise-images/sixteenth-eighth-sixteenth.png
D  +-    --    exercises/exercise-images/sixteenth-sixteenth-eighth.png
D  +-    --    exercises/exercise-images/sixteenth-sixteenth-sixteenth-sixteenth.png
D  +-    --    exercises/exercise-images/unknown-rhythm.png
D  +0    -428  exercises/intervals-ascending-melodic.json
D  +0    -428  exercises/intervals-descending-melodic.json
D  +0    -33   exercises/rhythm-easy.json
D  +0    -49   exercises/rhythm-medium.json
D  +0    -45   exercises/scales-major-and-its-modes.json
D  +-    --    icons/16-apps-minuet.png
D  +0    -975  icons/16-apps-minuet.svg
D  +-    --    icons/22-apps-minuet.png
D  +0    -923  icons/22-apps-minuet.svg
D  +-    --    icons/32-apps-minuet.png
D  +0    -1097 icons/32-apps-minuet.svg
D  +-    --    icons/48-apps-minuet.png
D  +0    -622  icons/48-apps-minuet.svg
D  +-    --    icons/64-apps-minuet.png
D  +0    -627  icons/64-apps-minuet.svg
D  +0    -10   icons/CMakeLists.txt
D  +0    -1097 icons/sc-apps-minuet.svgz
D  +0    -60   minuetandroid/CMakeLists.txt
D  +0    -34   minuetandroid/README
D  +0    -6    minuetandroid/README.packagers
D  +0    -45   minuetandroid/android/AndroidManifest.xml
D  +-    --    minuetandroid/android/res/drawable-hdpi/minuet.png
D  +-    --    minuetandroid/android/res/drawable-hdpi/splash.9.png
D  +-    --    minuetandroid/android/res/drawable-ldpi/minuet.png
D  +-    --    minuetandroid/android/res/drawable-ldpi/splash.9.png
D  +-    --    minuetandroid/android/res/drawable-mdpi/minuet.png
D  +-    --    minuetandroid/android/res/drawable-mdpi/splash.9.png
D  +-    --    minuetandroid/android/res/drawable-xhdpi/minuet.png
D  +-    --    minuetandroid/android/res/drawable-xhdpi/splash.9.png
D  +-    --    minuetandroid/android/res/drawable-xxhdpi/minuet.png
D  +-    --    minuetandroid/android/res/drawable-xxhdpi/splash.9.png
D  +-    --    minuetandroid/android/res/drawable-xxxhdpi/minuet.png
D  +-    --    minuetandroid/android/res/drawable-xxxhdpi/splash.9.png
D  +0    -7    minuetandroid/android/res/values/MinuetTheme.xml
D  +0    -4    minuetandroid/data/CMakeLists.txt
D  +0    -9    minuetandroid/data/definitions/CMakeLists.txt
D  +0    -113  minuetandroid/data/definitions/chords-root-position-definitions.json
D  +0    -124  minuetandroid/data/definitions/intervals-ascending-melodic-definitions.json
D  +0    -124  minuetandroid/data/definitions/intervals-descending-melodic-definitions.json
D  +0    -44   minuetandroid/data/definitions/rhythm-definitions.json
D  +0    -39   minuetandroid/data/definitions/scales-major-and-its-modes-definitions.json
D  +-    --    minuetandroid/data/exercise-images/current-rhythm.png
D  +-    --    minuetandroid/data/exercise-images/eighth-dot-sixteenth.png
D  +-    --    minuetandroid/data/exercise-images/eighth-eighth.png
D  +-    --    minuetandroid/data/exercise-images/eighth-sixteenth-sixteenth.png
D  +-    --    minuetandroid/data/exercise-images/quarter.png
D  +-    --    minuetandroid/data/exercise-images/sixteenth-eighth-dot.png
D  +-    --    minuetandroid/data/exercise-images/sixteenth-eighth-sixteenth.png
D  +-    --    minuetandroid/data/exercise-images/sixteenth-sixteenth-eighth.png
D  +-    --    minuetandroid/data/exercise-images/sixteenth-sixteenth-sixteenth-sixteenth.png
D  +-    --    minuetandroid/data/exercise-images/unknown-rhythm.png
D  +0    -10   minuetandroid/data/exercises/CMakeLists.txt
D  +0    -69   minuetandroid/data/exercises/chords-root-position-exercises.json
D  +0    -80   minuetandroid/data/exercises/intervals-ascending-melodic-exercises.json
D  +0    -80   minuetandroid/data/exercises/intervals-descending-melodic-exercises.json
D  +0    -18   minuetandroid/data/exercises/rhythm-easy.json
D  +0    -18   minuetandroid/data/exercises/rhythm-medium.json
D  +0    -18   minuetandroid/data/exercises/scales-major-and-its-modes-exercises.json
D  +0    -3    minuetandroid/deploy.sh
D  +0    -21   minuetandroid/icons/16-actions-minuet-chords.svg
D  +0    -21   minuetandroid/icons/16-actions-minuet-intervals.svg
D  +0    -21   minuetandroid/icons/16-actions-minuet-rhythms.svg
D  +0    -21   minuetandroid/icons/16-actions-minuet-scales.svg
D  +0    -21   minuetandroid/icons/22-actions-minuet-chords.svg
D  +0    -21   minuetandroid/icons/22-actions-minuet-intervals.svg
D  +0    -21   minuetandroid/icons/22-actions-minuet-rhythms.svg
D  +0    -21   minuetandroid/icons/22-actions-minuet-scales.svg
D  +-    --    minuetandroid/icons/48-apps-minuet.png
D  +0    -622  minuetandroid/icons/48-apps-minuet.svg
D  +-    --    minuetandroid/icons/64-apps-minuet.png
D  +0    -627  minuetandroid/icons/64-apps-minuet.svg
D  +0    -942  minuetandroid/icons/minuet-drawer.svg
D  +0    -939  minuetandroid/icons/minuet-splash.svg
D  +0    -1097 minuetandroid/icons/sc-apps-minuet.svgz
D  +-    --    minuetandroid/images/back.png
D  +-    --    minuetandroid/images/back at 2x.png
D  +-    --    minuetandroid/images/back at 3x.png
D  +-    --    minuetandroid/images/back at 4x.png
D  +-    --    minuetandroid/images/drawer.png
D  +-    --    minuetandroid/images/drawer at 2x.png
D  +-    --    minuetandroid/images/drawer at 3x.png
D  +-    --    minuetandroid/images/drawer at 4x.png
D  +-    --    minuetandroid/images/menu.png
D  +-    --    minuetandroid/images/menu at 2x.png
D  +-    --    minuetandroid/images/menu at 3x.png
D  +-    --    minuetandroid/images/menu at 4x.png
D  +-    --    minuetandroid/sf_GMbank.sf2
D  +0    -7    minuetandroid/sign.sh
D  +0    -39   minuetandroid/src/CMakeLists.txt
D  +0    -49   minuetandroid/src/csengine.cpp
D  +0    -42   minuetandroid/src/csengine.h
D  +0    -206  minuetandroid/src/csoundandroidsoundbackend.cpp
D  +0    -65   minuetandroid/src/csoundandroidsoundbackend.h
D  +0    -236  minuetandroid/src/exercisecontroller.cpp
D  +0    -70   minuetandroid/src/exercisecontroller.h
D  +-    --    minuetandroid/src/fonts/roboto/Roboto-Bold.ttf
D  +-    --    minuetandroid/src/fonts/roboto/Roboto-Regular.ttf
D  +0    -46   minuetandroid/src/iexercisecontroller.cpp
D  +0    -64   minuetandroid/src/iexercisecontroller.h
D  +-    --    minuetandroid/src/images/minuet-background.png
D  +0    -5178 minuetandroid/src/images/minuet-background.svg
D  +-    --    minuetandroid/src/images/minuet-drawer.png
D  +0    -39   minuetandroid/src/iplugin.cpp
D  +0    -46   minuetandroid/src/iplugin.h
D  +0    -81   minuetandroid/src/isoundbackend.cpp
D  +0    -108  minuetandroid/src/isoundbackend.h
D  +0    -38   minuetandroid/src/iuicontroller.cpp
D  +0    -44   minuetandroid/src/iuicontroller.h
D  +0    -46   minuetandroid/src/main.cpp
D  +0    -557  minuetandroid/src/qml/ExerciseView.qml
D  +0    -458  minuetandroid/src/qml/main.qml
D  +0    -33   minuetandroid/src/qml/pianoview/BlackKey.qml
D  +0    -43   minuetandroid/src/qml/pianoview/Octave.qml
D  +0    -131  minuetandroid/src/qml/pianoview/PianoView.qml
D  +0    -33   minuetandroid/src/qml/pianoview/WhiteKey.qml
D  +0    -37   minuetandroid/src/resources.qrc
D  +0    -74   minuetandroid/src/uicontroller.cpp
D  +0    -52   minuetandroid/src/uicontroller.h
D  +0    -42   minuetandroid/template.csd
D  +0    -34   minuetandroid/template_rhythm.csd
A  +8    -0    set-android-env.sh
A  +7    -0    src/+android/qtquickcontrols2.conf
M  +12   -26   src/CMakeLists.txt
A  +10   -0    src/Page1.qml     [License: UNKNOWN]  *
A  +22   -0    src/Page1Form.ui.qml     [License: UNKNOWN]  *
D  +0    -229  src/exercisecontroller.cpp
D  +0    -77   src/exercisecontroller.h
M  +12   -61   src/main.cpp
A  +97   -0    src/main.qml     [License: UNKNOWN]  *
D  +0    -450  src/midisequencer.cpp
D  +0    -148  src/midisequencer.h
D  +0    -182  src/midisequenceroutputthread.cpp
D  +0    -75   src/midisequenceroutputthread.h
D  +0    -186  src/minuet.cpp
D  +0    -94   src/minuet.h
D  +0    -18   src/minuetsettings.kcfg
D  +0    -5    src/minuetsettings.kcfgc
D  +0    -15   src/minuetui.rc
A  +9    -0    src/qml.qrc
D  +0    -297  src/qml/ExerciseView.qml
D  +0    -144  src/qml/Main.qml
D  +0    -95   src/qml/MinuetButtonStyle.qml
D  +0    -133  src/qml/MinuetMenu.qml
D  +0    -176  src/qml/RhythmAnswerView.qml
D  +-    --    src/qml/images/minuet-background.png
D  +0    -5178 src/qml/images/minuet-background.svg
D  +-    --    src/qml/images/multimedia-pause.png
D  +-    --    src/qml/images/multimedia-pitch.png
D  +-    --    src/qml/images/multimedia-play.png
D  +-    --    src/qml/images/multimedia-speed.png
D  +-    --    src/qml/images/multimedia-stop.png
D  +-    --    src/qml/images/multimedia-volume.png
D  +-    --    src/qml/images/navigate-next.png
D  +0    -138  src/qml/midiplayer/MidiPlayer.qml
D  +0    -51   src/qml/midiplayer/MultimediaButton.qml
D  +0    -47   src/qml/midiplayer/MultimediaSlider.qml
D  +0    -35   src/qml/pianoview/BlackKey.qml
D  +0    -43   src/qml/pianoview/Octave.qml
D  +0    -108  src/qml/pianoview/PianoView.qml
D  +0    -35   src/qml/pianoview/WhiteKey.qml
A  +2    -0    src/qtquickcontrols2.conf
D  +0    -91   src/settingsmidi.ui
D  +0    -81   src/song.cpp
D  +0    -60   src/song.h
D  +0    -144  src/wizard.cpp
D  +0    -96   src/wizard.h
D  +0    -44   src/wizardsystemcheck.ui

The files marked with a * at the end have a non valid license. Please read: http://techbase.kde.org/Policies/Licensing_Policy and use the headers which are listed at that page.


http://commits.kde.org/minuet/06f72af29365938a544c93b4fb428a0ae2297c71


More information about the kde-doc-english mailing list