diff --git a/mathtrainingstuff.pro.user.bcfd5fb b/mathtrainingstuff.pro.user.bcfd5fb new file mode 100644 index 0000000..667217e --- /dev/null +++ b/mathtrainingstuff.pro.user.bcfd5fb @@ -0,0 +1,941 @@ + + + + + + EnvironmentId + {bcfd5fb3-a6a7-4eb9-a1ad-002091839447} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.11.2 GCC 64bit + Desktop Qt 5.11.2 GCC 64bit + qt.qt5.5112.gcc_64_kit + 0 + 0 + 0 + + /home/admin/git/Qt/build-mathtrainingstuff-Desktop_Qt_5_11_2_GCC_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/admin/git/Qt/build-mathtrainingstuff-Desktop_Qt_5_11_2_GCC_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/admin/git/Qt/build-mathtrainingstuff-Desktop_Qt_5_11_2_GCC_64bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deployment + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deployment-Konfiguration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + mathtrainingstuff + + Qt4ProjectManager.Qt4RunConfiguration:/home/admin/git/Qt/mathtrainingstuff/mathtrainingstuff.pro + mathtrainingstuff.pro + + 3768 + false + true + true + false + false + true + + /home/admin/git/Qt/build-mathtrainingstuff-Desktop_Qt_5_11_2_GCC_64bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Android für armeabi-v7a (Clang Qt 5.11.2 for Android ARMv7) + Android für armeabi-v7a (Clang Qt 5.11.2 for Android ARMv7) + {cc8640a9-0952-4aaf-991b-11a00a5980b4} + 0 + 0 + 0 + + /home/admin/git/Qt/build-mathtrainingstuff-Android_f_r_armeabi_v7a_GCC_4_9_Qt_5_11_2_for_Android_ARMv7-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + + true + Anwendungsdaten kopieren + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-28 + + true + Android-APK erstellen + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/admin/git/Qt/build-mathtrainingstuff-Android_f_r_armeabi_v7a_GCC_4_9_Qt_5_11_2_for_Android_ARMv7-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + + true + Anwendungsdaten kopieren + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-28 + + true + Android-APK erstellen + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/admin/git/Qt/build-mathtrainingstuff-Android_f_r_armeabi_v7a_GCC_4_9_Qt_5_11_2_for_Android_ARMv7-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + + true + Anwendungsdaten kopieren + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-28 + + true + Android-APK erstellen + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + + true + Deployment auf Android-Gerät + + Qt4ProjectManager.AndroidDeployQtStep + false + + 1 + Deployment + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deployment auf Android-Gerät + + Qt4ProjectManager.AndroidDeployConfiguration2 + + 1 + + MQH4C16805001679 + 24 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + -1 + + + + Qt4ProjectManager.AndroidRunConfiguration:/home/admin/git/Qt/mathtrainingstuff/mathtrainingstuff.pro + + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.2 + + Android für x86 (Clang Qt 5.11.2 for Android x86) + Android für x86 (Clang Qt 5.11.2 for Android x86) + {866019ab-52b4-4d14-acc4-b5d4b2ae79e7} + 0 + 0 + 0 + + /home/admin/git/Qt/build-mathtrainingstuff-Android_f_r_x86_GCC_4_9_Qt_5_11_2_for_Android_x86-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + + true + Anwendungsdaten kopieren + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-28 + + true + Android-APK erstellen + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/admin/git/Qt/build-mathtrainingstuff-Android_f_r_x86_GCC_4_9_Qt_5_11_2_for_Android_x86-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + + true + Anwendungsdaten kopieren + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-28 + + true + Android-APK erstellen + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/admin/git/Qt/build-mathtrainingstuff-Android_f_r_x86_GCC_4_9_Qt_5_11_2_for_Android_x86-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + + true + Anwendungsdaten kopieren + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-28 + + true + Android-APK erstellen + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + + true + Deployment auf Android-Gerät + + Qt4ProjectManager.AndroidDeployQtStep + false + + 1 + Deployment + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deployment auf Android-Gerät + + Qt4ProjectManager.AndroidDeployConfiguration2 + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + -1 + + + + Qt4ProjectManager.AndroidRunConfiguration:/home/admin/git/Qt/mathtrainingstuff/mathtrainingstuff.pro + + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 3 + + + ProjectExplorer.Project.Updater.FileVersion + 20 + + + Version + 20 + + diff --git a/qml/StartPage.qml b/qml/StartPage.qml index 6a8ac7e..672c2bb 100644 --- a/qml/StartPage.qml +++ b/qml/StartPage.qml @@ -14,6 +14,10 @@ Page { GameComboBox { height: 40 width: 140 + anchors { + top: parent.top + left: parent.left + } } ComboBox { anchors { diff --git a/qml/components/GameBox.qml b/qml/components/GameBox.qml new file mode 100644 index 0000000..9c36e13 --- /dev/null +++ b/qml/components/GameBox.qml @@ -0,0 +1,5 @@ +import QtQuick 2.0 + +Item { + +} diff --git a/qml/components/GameComboBox.qml b/qml/components/GameComboBox.qml index 014733c..bd42242 100644 --- a/qml/components/GameComboBox.qml +++ b/qml/components/GameComboBox.qml @@ -1,20 +1,118 @@ import QtQuick 2.0 import QtQuick.Controls 2.2 +import "./" Item { + id: root property string clickedColor: "#BDBDBD" property string normalColor: "#e0e0e0" property string color: normalColor + property int currentIndex: 0 + property var model: ["None", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"] + + onCurrentIndexChanged: popup.close() + Rectangle { color: parent.color width: parent.width height: parent.height + TextArea { + anchors.verticalCenter: parent.verticalCenter + text: root.model[root.currentIndex] + } } MouseArea { + x: 0 + y: 0 width: parent.width height: parent.height onPressed: parent.color = parent.clickedColor onReleased: parent.color = parent.normalColor + onClicked: { + popup.open() + } + } + + Popup { + id: popup + x: root.x + y: root.y + width: root.width + height: model.length*root.height + background: Rectangle { + color: "#e0e0e0" + border.width: 5 + } + Repeater { + id: repeater + model: root.model.length + anchors { + top: parent.top + left: parent.left + } + Item { + id: delegate + anchors { + top: parent.top + left: parent.left + } + Rectangle { + width: root.width + height: root.height + border.width: 5 + anchors { + top: parent.top + topMargin: index*root.height + } + Text { + text: "x: " + x + " y: " + y + } + } + MouseArea { + width: root.width + height: root.height + anchors { + top: parent.top + topMargin: index*root.height + } + onClicked: { + root.currentIndex = index + } + } + } + } + + /* + ListModel { + id: weekDayModel + ListElement { + weekDay: "Monday" + } + ListElement { + weekDay: "Tuesday" + } + ListElement { + weekDay: "Wednesday" + } + } + ListView { + width: root.width + height: root.height + model: weekDayModel + delegate: Component { + Item { + width: root.width + height: root.height + Text { + text: weekDay + } + } + } + highlight: Rectangle { + color: "lightsteelblue" + } + } + */ } }