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 7b7eec8..0b8f2aa 100644 Binary files a/graphics/sheute.png and b/graphics/sheute.png differ diff --git a/graphics/sheute_new.png b/graphics/sheute_new.png new file mode 100644 index 0000000..7b7eec8 Binary files /dev/null and b/graphics/sheute_new.png differ 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"