[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [minuet/minuetandroid] minuetandroid/src: Remove RhythmAnswerView
From:       Ayush Shah <1595ayush () gmail ! com>
Date:       2016-08-14 17:43:42
Message-ID: E1bYzRm-0004O9-PM () code ! kde ! org
[Download RAW message or body]

Git commit 4f8d5b4e7b53e97285cf7a72a8121b147a3eed2f by Ayush Shah.
Committed on 14/08/2016 at 17:42.
Pushed by ayushshah into branch 'minuetandroid'.

Remove RhythmAnswerView

D  +0    -184  minuetandroid/src/qml/RhythmAnswerView.qml
M  +0    -1    minuetandroid/src/resources.qrc

http://commits.kde.org/minuet/4f8d5b4e7b53e97285cf7a72a8121b147a3eed2f

diff --git a/minuetandroid/src/qml/RhythmAnswerView.qml \
b/minuetandroid/src/qml/RhythmAnswerView.qml deleted file mode 100644
index 82b7a8f..0000000
--- a/minuetandroid/src/qml/RhythmAnswerView.qml
+++ /dev/null
@@ -1,184 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 by Sandro S. Andrade <sandroandrade@kde.org>
-**
-** This program is free software; you can redistribute it and/or
-** modify it under the terms of the GNU General Public License as
-** published by the Free Software Foundation; either version 2 of
-** the License or (at your option) version 3 or any later version
-** accepted by the membership of KDE e.V. (or its successor approved
-** by the membership of KDE e.V.), which shall act as a proxy
-** defined in Section 14 of version 3 of the license.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program.  If not, see <http://www.gnu.org/licenses/>.
-**
-****************************************************************************/
-/*
-import QtQuick 2.7
-import QtQuick.Controls 2.0
-import QtQuick.Controls.Material 2.0
-
-Column {
-    property var answers: [
-        "current-rhythm.png",
-        "unknown-rhythm.png",
-        "unknown-rhythm.png",
-        "unknown-rhythm.png"
-    ]
-    property int currentAnswer: 0
-    property var correctAnswers
-    property var correctColors: ["#ffffff", "#ffffff", "#ffffff", "#ffffff"]
-    property ExerciseView exerciseView
-    property var rhythmColors: ["#ffffff", "#ffffff", "#ffffff", "#ffffff"]
-
-    signal answerCompleted(var answers)
-
-    function answerClicked(answerImageSource, color) {
-        var tempAnswers = answers
-        tempAnswers[currentAnswer] = answerImageSource
-        var tempColors = rhythmColors
-        tempColors[currentAnswer] = color
-        rhythmColors = tempColors
-        currentAnswer++
-        if (currentAnswer == 4) {
-            answerCompleted(answers)
-            correctColors = exerciseView.chosenColors
-            for (var i = 0; i < 4; ++i)
-                correctAnswerGrid.children[i].opacity = \
                answers[i].toString().split("/").pop().split(".")[0] != \
                correctAnswers[i] ? 1:0
-        }
-        else {
-            tempAnswers[currentAnswer] = "current-rhythm.png"
-        }
-        answers = tempAnswers
-    }
-    function resetAnswers() {
-        currentAnswer = 0
-        answers = ["current-rhythm.png", "unknown-rhythm.png", "unknown-rhythm.png", \
                "unknown-rhythm.png"]
-        correctAnswers = undefined
-        rhythmColors = ["#ffffff", "#ffffff", "#ffffff", "#ffffff"]
-        correctColors = ["#ffffff", "#ffffff", "#ffffff", "#ffffff"]
-        for (var i = 0; i < 4; ++i)
-            correctAnswerGrid.children[i].opacity = 0
-    }
-    function showCorrectAnswer(chosenExercises, chosenColors) {
-        var tempAnswers = answers
-        for (var i = 0; i < 4; ++i)
-            tempAnswers[i] = chosenExercises[i] + ".png"
-        answers = tempAnswers
-        rhythmColors = chosenColors
-        currentAnswer = 0
-    }
-    function fillCorrectAnswerGrid() {
-        for (var i = 0; i < 4; ++i)
-            correctAnswerGrid.children[i].opacity = 0
-        correctAnswers = exerciseView.chosenExercises
-    }
-
-    spacing: 10
-
-    Row {
-        id: correctAnswerGrid
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        spacing: 10
-
-        Repeater {
-            model: 4
-
-            Rectangle {
-                id: correctAnswerRectangle
-
-                width: app.width*0.85/8; height: 59
-                color: correctColors[index]
-                opacity: 0
-
-                Image {
-                    id: correctRhythmImage
-
-                    anchors.centerIn: parent
-                    source: (correctAnswers != undefined && \
exerciseController.currentExercise["playMode"] == "rhythm") ?  correctAnswers[index] \
                + ".png":""
-                    fillMode: Image.Pad
-                }
-            }
-        }
-    }
-
-    Rectangle {
-        id: answerRect
-
-        color: "#475057"
-        radius: 5
-        anchors.horizontalCenter: parent.horizontalCenter
-        width: answerGrid.width + 20; height: answerGrid.height + 20
-
-        Row {
-            id: answerGrid
-
-            anchors.centerIn: parent
-            spacing: 10
-            Repeater {
-                model: 4
-
-                Rectangle {
-                    id: answerRectangle
-
-                    width: app.width*0.85/8
-                    height: 59
-                    color: rhythmColors[index]
-
-                    Text {
-                        id: option
-
-                        property string originalText
-
-                        visible: false
-                        width: parent.width
-                        anchors.centerIn: parent
-                        horizontalAlignment: Qt.AlignHCenter
-                        color: "black"
-                        wrapMode: Text.Wrap
-                    }
-                    Image {
-                        id: rhythmImage
-                        anchors.centerIn: parent
-
-                        source: answers[index]
-                        fillMode: Image.Pad
-                    }
-                }
-            }
-        }
-    }
-    Button {
-        id: backspaceButton
-
-        width: answerRect.width; height: implicitHeight
-        anchors.horizontalCenter: parent.horizontalCenter
-        text: "backspace"
-        enabled: currentAnswer > 0 && currentAnswer < 4
-        onClicked: {
-            if (currentAnswer > 0) {
-                var tempAnswers = answers
-                var tempColors = rhythmColors
-                tempAnswers[currentAnswer] = "unknown-rhythm.png"
-                currentAnswer--
-                tempAnswers[currentAnswer] = "current-rhythm.png"
-                tempColors[currentAnswer] = "#ffffff"
-                answers = tempAnswers
-                rhythmColors = tempColors
-            }
-        }
-        //style: MinuetButtonStyle{ labelHorizontalAlignment: Qt.AlignHCenter }
-    }
-    Connections {
-        target: exerciseController
-        onCurrentExerciseChanged: resetAnswers()
-    }
-}
-*/
diff --git a/minuetandroid/src/resources.qrc b/minuetandroid/src/resources.qrc
index 75bd74d..69d62b5 100644
--- a/minuetandroid/src/resources.qrc
+++ b/minuetandroid/src/resources.qrc
@@ -3,7 +3,6 @@
 	<file alias="minuet.svgz">../icons/sc-apps-minuet.svgz</file>
         <file alias="main.qml">qml/main.qml</file>
         <file alias="ExerciseView.qml">qml/ExerciseView.qml</file>
-        <file alias="RhythmAnswerView.qml">qml/RhythmAnswerView.qml</file>
         <file alias="BlackKey.qml">qml/pianoview/BlackKey.qml</file>
         <file alias="Octave.qml">qml/pianoview/Octave.qml</file>
         <file alias="PianoView.qml">qml/pianoview/PianoView.qml</file>


[prev in list] [next in list] [prev in thread] [next in thread]