From 0119b63be160fcee8885fd302c023e738d5c23a6 Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Tue, 17 Jul 2018 21:03:40 +0200 Subject: [PATCH] Fixed bug on windows that made the reset button disappear. --- main.qml | 6 +- speedclimbing_stopwatch.pro.user | 393 +------------- speedclimbing_stopwatch.pro.user.21eb7c7 | 655 +++++++++++++++++++++++ 3 files changed, 686 insertions(+), 368 deletions(-) create mode 100644 speedclimbing_stopwatch.pro.user.21eb7c7 diff --git a/main.qml b/main.qml index a635a5a..9bf687c 100644 --- a/main.qml +++ b/main.qml @@ -7,7 +7,7 @@ Window { visible: true width: 540 height: 960 - title: qsTr("Hello World") + title: qsTr("speedclimbing stw") property date currentTime: new Date() property int millis: 0 @@ -124,7 +124,7 @@ Window { //state for the start page PropertyChanges { target: time; text: "Click start to start"; font.pixelSize: parent.height * 0.3 } PropertyChanges { target: time_container; height: parent.height * 0.15 } - PropertyChanges { target: startButt; enabled: true; text: "start"; height: parent.height - (parent.height * 0.5); anchors.bottomMargin: parent.height * 0.5 - height * 0.5 } + PropertyChanges { target: startButt; enabled: true; text: "start"; height: parent.height - (parent.height * 0.5); anchors.bottomMargin: parent.height * 0.5 - startButt.height * 0.5 } }, State { name: "STARTING" @@ -144,7 +144,7 @@ Window { name: "STOPPED" //state when the meassuring is over PropertyChanges { target: time; text: ( root.stoppedTime / 1000 ).toFixed(3) + " sec"; font.pixelSize: parent.height * 0.1 } - PropertyChanges { target: startButt; enabled: true; text: "reset"; height: parent.height - (parent.height * 0.8); anchors.bottomMargin: parent.height * 0.2 - height * 0.5 } + PropertyChanges { target: startButt; enabled: true; text: "reset"; height: parent.height - (parent.height * 0.8); anchors.bottomMargin: parent.height * 0.2 - startButt.height * 0.5 } PropertyChanges { target: time_container; height: parent.height * 0.8 } } ] diff --git a/speedclimbing_stopwatch.pro.user b/speedclimbing_stopwatch.pro.user index a5439a1..79bee9e 100644 --- a/speedclimbing_stopwatch.pro.user +++ b/speedclimbing_stopwatch.pro.user @@ -1,14 +1,14 @@ - + EnvironmentId - {21eb7c7e-fe37-4955-bdba-642d7341ba98} + {a7af30b9-cb0f-45fd-9894-328c8b8b2887} ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings @@ -59,14 +59,14 @@ ProjectExplorer.Project.Target.0 - Desktop Qt 5.11.1 GCC 64bit - Desktop Qt 5.11.1 GCC 64bit - qt.qt5.5111.gcc_64_kit + Desktop Qt 5.10.1 MinGW 32bit + Desktop Qt 5.10.1 MinGW 32bit + qt.qt5.5101.win32_mingw53_kit 0 0 0 - /home/dorian/Documents/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Desktop_Qt_5_11_1_GCC_64bit-Debug + D:/Documents/Git/build-speedclimbing_stopwatch-Desktop_Qt_5_10_1_MinGW_32bit-Debug true @@ -84,16 +84,13 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + false 2 - Build + Erstellen ProjectExplorer.BuildSteps.Build @@ -103,16 +100,13 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + true clean 1 - Clean + Bereinigen ProjectExplorer.BuildSteps.Clean @@ -126,7 +120,7 @@ true - /home/dorian/Documents/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Desktop_Qt_5_11_1_GCC_64bit-Release + D:/Documents/Git/build-speedclimbing_stopwatch-Desktop_Qt_5_10_1_MinGW_32bit-Release true @@ -137,23 +131,20 @@ false false - true + false true Make Qt4ProjectManager.MakeStep - - -w - -r - + false 2 - Build + Erstellen ProjectExplorer.BuildSteps.Build @@ -163,16 +154,13 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + true clean 1 - Clean + Bereinigen ProjectExplorer.BuildSteps.Clean @@ -186,7 +174,7 @@ true - /home/dorian/Documents/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Desktop_Qt_5_11_1_GCC_64bit-Profile + D:/Documents/Git/build-speedclimbing_stopwatch-Desktop_Qt_5_10_1_MinGW_32bit-Profile true @@ -197,23 +185,20 @@ false true - true + false true Make Qt4ProjectManager.MakeStep - - -w - -r - + false 2 - Build + Erstellen ProjectExplorer.BuildSteps.Build @@ -223,16 +208,13 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + true clean 1 - Clean + Bereinigen ProjectExplorer.BuildSteps.Clean @@ -249,12 +231,12 @@ 0 - Deploy + Deployment ProjectExplorer.BuildSteps.Deploy 1 - Deploy Configuration + Deployment-Konfiguration ProjectExplorer.DefaultDeployConfiguration @@ -304,332 +286,13 @@ speedclimbing_stopwatch - Qt4ProjectManager.Qt4RunConfiguration:/home/dorian/Documents/climbing_normspeed_stopwatch/climbing_normspeed_stopwatch/speedclimbing_stopwatch.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/Documents/Git/speedclimbing_stopwatch/speedclimbing_stopwatch.pro true speedclimbing_stopwatch.pro false - /home/dorian/Documents/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Android_for_armeabi_v7a_GCC_4_9_Qt_5_11_1_for_Android_armv7-Release - 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} - 1 - 0 - 0 - - /home/dorian/Documents/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-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/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Android_for_armeabi_v7a_GCC_4_9_Qt_5_11_1_for_Android_armv7-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Copy application data - - Qt4ProjectManager.AndroidPackageInstallationStep - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - android-27 - /home/dorian/Documents/climbing_normspeed_stopwatch/climbing_normspeed_stopwatch/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/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-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 - - 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 - - - - - speedclimbing_stopwatch - speedclimbing_stopwatch - Qt4ProjectManager.AndroidRunConfiguration:/home/dorian/Documents/climbing_normspeed_stopwatch/climbing_normspeed_stopwatch/speedclimbing_stopwatch.pro - speedclimbing_stopwatch.pro + D:/Documents/Git/build-speedclimbing_stopwatch-Desktop_Qt_5_10_1_MinGW_32bit-Debug 3768 false true @@ -642,7 +305,7 @@ ProjectExplorer.Project.TargetCount - 2 + 1 ProjectExplorer.Project.Updater.FileVersion diff --git a/speedclimbing_stopwatch.pro.user.21eb7c7 b/speedclimbing_stopwatch.pro.user.21eb7c7 new file mode 100644 index 0000000..a5439a1 --- /dev/null +++ b/speedclimbing_stopwatch.pro.user.21eb7c7 @@ -0,0 +1,655 @@ + + + + + + EnvironmentId + {21eb7c7e-fe37-4955-bdba-642d7341ba98} + + + ProjectExplorer.Project.ActiveTarget + 1 + + + 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 + + + + ProjectExplorer.Project.Target.0 + + 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/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Desktop_Qt_5_11_1_GCC_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + 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/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Desktop_Qt_5_11_1_GCC_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + 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/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Desktop_Qt_5_11_1_GCC_64bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + 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 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + 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 + + speedclimbing_stopwatch + + Qt4ProjectManager.Qt4RunConfiguration:/home/dorian/Documents/climbing_normspeed_stopwatch/climbing_normspeed_stopwatch/speedclimbing_stopwatch.pro + true + + speedclimbing_stopwatch.pro + false + + /home/dorian/Documents/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Android_for_armeabi_v7a_GCC_4_9_Qt_5_11_1_for_Android_armv7-Release + 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} + 1 + 0 + 0 + + /home/dorian/Documents/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-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/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Android_for_armeabi_v7a_GCC_4_9_Qt_5_11_1_for_Android_armv7-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Copy application data + + Qt4ProjectManager.AndroidPackageInstallationStep + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + android-27 + /home/dorian/Documents/climbing_normspeed_stopwatch/climbing_normspeed_stopwatch/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/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-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 + + 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 + + + + + speedclimbing_stopwatch + speedclimbing_stopwatch + Qt4ProjectManager.AndroidRunConfiguration:/home/dorian/Documents/climbing_normspeed_stopwatch/climbing_normspeed_stopwatch/speedclimbing_stopwatch.pro + speedclimbing_stopwatch.pro + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + +