From 89d124c5f6bdf9e1fb7d5af3140af390a38de567 Mon Sep 17 00:00:00 2001 From: dorian Date: Wed, 27 Jun 2018 20:26:02 +0200 Subject: [PATCH] =?UTF-8?q?klick=20Animation,=20Skailieren=20des=20Textes?= =?UTF-8?q?=20und=20striche=20zwischen=20den=20einzelnen=20Zeilen=20beim?= =?UTF-8?q?=20Speiseplan=20eingef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fannyapp.pro.user | 659 +++++++++++++++++++------------------- graphics/sheute.png | Bin 8103 -> 5101 bytes graphics/sheute_new.png | Bin 0 -> 8103 bytes qml/AppToolBar.qml | 2 - qml/FoodPlanForm.qml | 84 ++++- qml/HomeForm.qml | 43 ++- qml/main.qml | 4 + qml/qtquickcontrols2.conf | 2 +- 8 files changed, 437 insertions(+), 357 deletions(-) create mode 100644 graphics/sheute_new.png diff --git a/fannyapp.pro.user b/fannyapp.pro.user index 747c1ec..32ee976 100644 --- a/fannyapp.pro.user +++ b/fannyapp.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -8,7 +8,7 @@ ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings @@ -59,333 +59,14 @@ ProjectExplorer.Project.Target.0 - Android for armeabi-v7a (GCC 4.9, Qt 5.10.1 for Android armv7) - Android for armeabi-v7a (GCC 4.9, Qt 5.10.1 for Android armv7) - {c2d2fa4a-1656-4ab9-a542-92c96158a688} + Desktop Qt 5.11.1 GCC 64bit + Desktop Qt 5.11.1 GCC 64bit + qt.qt5.5111.gcc_64_kit 0 0 0 - /home/dorian/Documents/Fanny App/build-fannyapp-Android_for_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - true - Copy application data - - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-27 - - true - Build Android APK - - QmakeProjectManager.AndroidBuildApkStep - false - false - - 4 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/dorian/Documents/builds/Qt/fanny-app/build-fannyapp-Android_for_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - true - Copy application data - - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-27 - /home/dorian/Documents/gitlab/fanny-app/android_release.keystore - true - Build Android APK - - QmakeProjectManager.AndroidBuildApkStep - false - false - - 4 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /home/dorian/Documents/Fanny App/build-fannyapp-Android_for_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - true - Copy application data - - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-27 - - true - Build Android APK - - QmakeProjectManager.AndroidBuildApkStep - false - false - - 4 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - - true - Deploy to Android device - - Qt4ProjectManager.AndroidDeployQtStep - false - - 1 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy to Android device - - Qt4ProjectManager.AndroidDeployConfiguration2 - - 1 - - MWS0216A15001488 - 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 - - - - - fannyapp - fannyapp - Qt4ProjectManager.AndroidRunConfiguration:/home/dorian/Documents/gitlab/fanny-app/fannyapp.pro - fannyapp.pro - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop Qt 5.10.1 GCC 64bit - Desktop Qt 5.10.1 GCC 64bit - qt.qt5.5101.gcc_64_kit - 0 - 0 - 0 - - /home/dorian/Documents/builds/Qt/fanny-app + /home/dorian/Documents/gitlab/build-fannyapp-Desktop_Qt_5_11_1_GCC_64bit-Debug true @@ -445,7 +126,7 @@ true - /home/dorian/Documents/Fanny App/build-fannyapp-Desktop_Qt_5_10_1_GCC_64bit-Release + /home/dorian/Documents/gitlab/build-fannyapp-Desktop_Qt_5_11_1_GCC_64bit-Release true @@ -456,7 +137,7 @@ false false - false + true true @@ -505,7 +186,7 @@ true - /home/dorian/Documents/Fanny App/build-fannyapp-Desktop_Qt_5_10_1_GCC_64bit-Profile + /home/dorian/Documents/gitlab/build-fannyapp-Desktop_Qt_5_11_1_GCC_64bit-Profile true @@ -516,7 +197,7 @@ false true - false + true true @@ -622,14 +303,330 @@ 2 fannyapp - fannyapp2 + Qt4ProjectManager.Qt4RunConfiguration:/home/dorian/Documents/gitlab/fanny-app/fannyapp.pro true fannyapp.pro false - /home/dorian/Documents/builds/Qt/fanny-app + /home/dorian/Documents/gitlab/build-fannyapp-Desktop_Qt_5_11_1_GCC_64bit-Debug + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.1 + + Android for armeabi-v7a (GCC 4.9, Qt 5.11.1 for Android armv7) + Android for armeabi-v7a (GCC 4.9, Qt 5.11.1 for Android armv7) + {90080436-d11a-44c6-8604-3a0027d99b29} + 0 + 0 + 0 + + /home/dorian/Documents/gitlab/build-fannyapp-Android_for_armeabi_v7a_GCC_4_9_Qt_5_11_1_for_Android_armv7-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + true + Copy application data + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-27 + + true + Build Android APK + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/dorian/Documents/gitlab/build-fannyapp-Android_for_armeabi_v7a_GCC_4_9_Qt_5_11_1_for_Android_armv7-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + true + Copy application data + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-27 + + true + Build Android APK + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/dorian/Documents/gitlab/build-fannyapp-Android_for_armeabi_v7a_GCC_4_9_Qt_5_11_1_for_Android_armv7-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + true + Copy application data + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-27 + + true + Build Android APK + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + + true + Deploy to Android device + + Qt4ProjectManager.AndroidDeployQtStep + false + + 1 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy to Android device + + 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 + + + + + fannyapp + fannyapp + Qt4ProjectManager.AndroidRunConfiguration:/home/dorian/Documents/gitlab/fanny-app/fannyapp.pro + fannyapp.pro 3768 false true diff --git a/graphics/sheute.png b/graphics/sheute.png index 7b7eec862ab64d12599233ac93f165891a7681f1..0b8f2aaf905f4da82d067f0adb3cc57aaf95243a 100644 GIT binary patch literal 5101 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 diff --git a/graphics/sheute_new.png b/graphics/sheute_new.png new file mode 100644 index 0000000000000000000000000000000000000000..7b7eec862ab64d12599233ac93f165891a7681f1 GIT binary patch literal 8103 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 literal 0 HcmV?d00001 diff --git a/qml/AppToolBar.qml b/qml/AppToolBar.qml index fe3469b..1e1f341 100644 --- a/qml/AppToolBar.qml +++ b/qml/AppToolBar.qml @@ -11,8 +11,6 @@ ToolBar { height: 30 visible: window.is_error & stackView.currentItem.objectName !== "LoginPage" & showErrorBar anchors.top: parent.bottom - - color: "red" Text { anchors.verticalCenter: parent.verticalCenter diff --git a/qml/FoodPlanForm.qml b/qml/FoodPlanForm.qml index fb7ce95..73b66af 100644 --- a/qml/FoodPlanForm.qml +++ b/qml/FoodPlanForm.qml @@ -16,15 +16,15 @@ Page { // horizontalAlignment: Image.AlignLeft // verticalAlignment: Image.AlignTop // } - LinearGradient { - anchors.fill: parent - start: Qt.point(0, 0) - end: Qt.point(0, parent.height) - gradient: Gradient { - GradientStop { position: 0.0; color: "#4db2b3" } - GradientStop { position: 1.0; color: "#8f4dae" } - } - } +// LinearGradient { +// anchors.fill: parent +// start: Qt.point(0, 0) +// end: Qt.point(0, parent.height) +// gradient: Gradient { +// GradientStop { position: 0.0; color: "#4db2b3" } +// GradientStop { position: 1.0; color: "#8f4dae" } +// } +// } Timer { id: firstLoadTimer @@ -61,9 +61,11 @@ Page { //text: getText(index, "cookteam") width: parent.width id: delegate - height: listView.isDayVisible(index) ? childrenRect.height:0 + height: visible ? cookteam.height + date.height + main_dish.height + main_dish_veg.height + garnish.height + dessert.height + spacer.height + cust_spacing*9 + 5:0 visible: listView.isDayVisible(index) + property int cust_spacing: 5 + Label { anchors.left: parent.left anchors.leftMargin: 10 @@ -72,6 +74,9 @@ Page { font.bold: true id: cookteam text: _cppServerConn.getFoodPlanData(index).cookteam + width: parent.width - 10 + wrapMode: Label.Wrap + height: text!=""? none:0 } Label { anchors.left: parent.left @@ -80,49 +85,106 @@ Page { font.bold: true id: date text: listView.getDateString(index) + width: parent.width - 10 + wrapMode: Label.Wrap } Rectangle { anchors.top: date.bottom + anchors.topMargin: cust_spacing anchors.left: parent.left anchors.leftMargin: 10 anchors.right: parent.right anchors.rightMargin: 10 - height: 1 + height: 2 color: "grey" + } Label { anchors.left: parent.left anchors.leftMargin: 10 anchors.top: date.bottom + anchors.topMargin: cust_spacing * 2 + width: parent.width - 10 + wrapMode: Label.Wrap id: main_dish text: _cppServerConn.getFoodPlanData(index).main_dish + height: text!=""? none:0 } + + Rectangle { + anchors.top: main_dish.bottom + anchors.topMargin: cust_spacing + anchors.left: parent.left + anchors.leftMargin: 10 + width: parent.width / 10 + height: main_dish_veg.text!=""? 1:0 + color: "grey" + + } + Label { anchors.left: parent.left anchors.leftMargin: 10 anchors.top: main_dish.bottom + anchors.topMargin: cust_spacing * 2 id: main_dish_veg text: _cppServerConn.getFoodPlanData(index).main_dish_veg + width: parent.width - 10 + wrapMode: Label.Wrap + height: text!=""? none:0 } + + Rectangle { + anchors.top: main_dish_veg.bottom + anchors.topMargin: cust_spacing + anchors.left: parent.left + anchors.leftMargin: 10 + width: parent.width / 10 + height: garnish.text!=""? 1:0 + color: "grey" + } + Label { anchors.left: parent.left anchors.leftMargin: 10 anchors.top: main_dish_veg.bottom + anchors.topMargin: cust_spacing * 2 id: garnish text: _cppServerConn.getFoodPlanData(index).garnish + width: parent.width - 10 + wrapMode: Label.Wrap + height: text!=""? none:0 } + + Rectangle { + anchors.top: garnish.bottom + anchors.topMargin: cust_spacing + anchors.left: parent.left + anchors.leftMargin: 10 + width: parent.width / 10 + height: dessert.text!=""? 1:0 + color: "grey" + + } + Label { anchors.left: parent.left anchors.leftMargin: 10 anchors.top: garnish.bottom + anchors.topMargin: cust_spacing * 2 id: dessert text: _cppServerConn.getFoodPlanData(index).dessert + width: parent.width - 10 + wrapMode: Label.Wrap + height: text!=""? none:0 } + Label { anchors.left: parent.left anchors.leftMargin: 10 anchors.top: dessert.bottom + anchors.topMargin: cust_spacing id: spacer text: "" } diff --git a/qml/HomeForm.qml b/qml/HomeForm.qml index 5f59bdb..77b9173 100644 --- a/qml/HomeForm.qml +++ b/qml/HomeForm.qml @@ -17,15 +17,15 @@ Page { // } - LinearGradient { - anchors.fill: parent - start: Qt.point(0, 0) - end: Qt.point(0, parent.height) - gradient: Gradient { - GradientStop { position: 0.0; color: "#4db2b3" } - GradientStop { position: 1.0; color: "#8f4dae" } - } - } +// LinearGradient { +// anchors.fill: parent +// start: Qt.point(0, 0) +// end: Qt.point(0, parent.height) +// gradient: Gradient { +// GradientStop { position: 0.0; color: "#4db2b3" } +// GradientStop { position: 1.0; color: "#8f4dae" } +// } +// } Label { id: laWelcome @@ -33,7 +33,7 @@ Page { font.pixelSize: 20 wrapMode: Label.Wrap width: window.width / 1.2 - color: "#424753" + color: window.text_color anchors { top: parent.top topMargin: window.height / 8 - laWelcome.height / 2 @@ -44,8 +44,6 @@ Page { Button { id:buttToday enabled: window.is_error === false - height: 200 - width: 200 anchors { left: parent.left leftMargin: (window.width / 4) - (buttToday.width / 2) @@ -56,9 +54,19 @@ Page { verificationDialog.day = "sheute" verificationDialog.open() } + + onPressed: sheuteImage.scale = 0.9 + onReleased: sheuteImage.scale = 1.0 + background: Image { id: sheuteImage source: "qrc:/graphics/sheute.png" + + Behavior on scale { + PropertyAnimation { + duration: 100 + } + } } } @@ -75,10 +83,21 @@ Page { verificationDialog.day = "smorgen" verificationDialog.open() } + + onPressed: smorgenImage.scale = 0.9 + onReleased: smorgenImage.scale = 1.0 + background: Image { id: smorgenImage source: "qrc:/graphics/smorgen.png" + + Behavior on scale { + PropertyAnimation { + duration: 100 + } + } } + } Rectangle { diff --git a/qml/main.qml b/qml/main.qml index 97820de..6e18fd8 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -12,6 +12,10 @@ ApplicationWindow { property bool initdone: false property bool firstinitdone: false + property string text_color: "black" //"#424753" + property string background_color: "white" + property string toolbar_color: "#312f38" + onBeforeRendering: { if(!firstinitdone){ var isinit = _cppAppSettings.loadSetting("init") diff --git a/qml/qtquickcontrols2.conf b/qml/qtquickcontrols2.conf index b64a7ee..d8555d5 100644 --- a/qml/qtquickcontrols2.conf +++ b/qml/qtquickcontrols2.conf @@ -6,4 +6,4 @@ Style=Default [Material] -Primary="#312f38" +; Primary="#312f38"