diff --git a/blueROCK.pro b/blueROCK.pro index 6224de8..8319b36 100644 --- a/blueROCK.pro +++ b/blueROCK.pro @@ -1,7 +1,7 @@ QT += quick qml quickcontrols2 purchasing widgets CONFIG += c++11 -VERSION = 0.04 +VERSION = 0.5.0 TARGET = blueROCK # The following define makes your compiler emit warnings if you use diff --git a/resources/qml/Components/ResultDelegate.qml b/resources/qml/Components/ResultDelegate.qml index 4d77a0d..29a1df5 100644 --- a/resources/qml/Components/ResultDelegate.qml +++ b/resources/qml/Components/ResultDelegate.qml @@ -9,7 +9,7 @@ ItemDelegate { property var thisData: widgetData[ "participants" ][partDel.ind] width: control.width - height: app.landscape() ? 40:70 + height: partDelCol.showSideBySide ? 40:70 text: "" @@ -44,11 +44,13 @@ ItemDelegate { GridLayout { id: partDelCol + property bool showSideBySide: app.landscape() || app.largeScreen() + anchors.fill: parent anchors.margins: 5 - columns: app.landscape() ? 2:1 - rows: app.landscape()? 1:2 + columns: showSideBySide ? 2:1 + rows: showSideBySide ? 1:2 columnSpacing: height * 0.2 rowSpacing: 0 @@ -110,8 +112,8 @@ ItemDelegate { Row { id: partDelSecondRow - Layout.preferredWidth: app.landscape() ? parent.width * 0.5 : parent.width - Layout.preferredHeight: app.landscape() ? parent.height : parent.height * 0.5 + Layout.preferredWidth: partDelCol.showSideBySide ? parent.width * 0.5 : parent.width + Layout.preferredHeight: partDelCol.showSideBySide ? parent.height : parent.height * 0.5 visible: multiResRow.active || multiGenResRow.active || resultLa.acitve diff --git a/resources/qml/Components/SpeedFlowChartLocker.qml b/resources/qml/Components/SpeedFlowChartLocker.qml index 4418db4..68d2984 100644 --- a/resources/qml/Components/SpeedFlowChartLocker.qml +++ b/resources/qml/Components/SpeedFlowChartLocker.qml @@ -80,10 +80,16 @@ Rectangle { } SwipeGallery { + property string platformIcons: Qt.platform.os === "osx" || Qt.platform.os === "iso" ? "ios":"android" + Layout.fillHeight: true Layout.fillWidth: true - images: ["qrc:/screenshots/SpeedFlowchartDemo/1.png","qrc:/screenshots/SpeedFlowchartDemo/2.png","qrc:/screenshots/SpeedFlowchartDemo/3.png"] + images: [ + "qrc:/screenshots/SpeedFlowchartDemo/" + platformIcons + "/1.jpeg", + "qrc:/screenshots/SpeedFlowchartDemo/" + platformIcons + "/2.jpeg", + "qrc:/screenshots/SpeedFlowchartDemo/" + platformIcons + "/3.jpeg" + ] } Button { @@ -99,6 +105,8 @@ Rectangle { RowLayout { + Layout.alignment: Layout.Center + Button { id: restorePurchaseButton Layout.alignment: Layout.Center diff --git a/resources/qml/Components/SpeedFlowChartPopup.qml b/resources/qml/Components/SpeedFlowChartPopup.qml index 989bb42..5456a8d 100644 --- a/resources/qml/Components/SpeedFlowChartPopup.qml +++ b/resources/qml/Components/SpeedFlowChartPopup.qml @@ -8,8 +8,10 @@ Rectangle { property var flowchartData: ({}) // always unlock in debug mode + //property bool unlocked: QT_DEBUG || appSettings.read("speedBackendPurchase") === "1" property bool unlocked: appSettings.read("speedBackendPurchase") === "1" + state: "hidden" anchors { diff --git a/resources/qml/Pages/StartPage.qml b/resources/qml/Pages/StartPage.qml index 3e0d5ca..66b536c 100644 --- a/resources/qml/Pages/StartPage.qml +++ b/resources/qml/Pages/StartPage.qml @@ -94,7 +94,7 @@ Page { flat: true font.bold: true - font.pixelSize: 15 + font.pixelSize: aboutBluerockDisclaimerButton.font.pixelSize text: "Where are the IFSC results?" @@ -102,9 +102,10 @@ Page { } Button { - flat: true + id: aboutBluerockDisclaimerButton - font.pixelSize: 15 + flat: true + font.pixelSize: bottomDigitalrockDisclaimerLabel.paintedHeight * 0.735 text: "About blueROCK" diff --git a/resources/qml/main.qml b/resources/qml/main.qml index fbbafd4..be4ab63 100644 --- a/resources/qml/main.qml +++ b/resources/qml/main.qml @@ -507,6 +507,10 @@ Window { return app.height < app.width } + function largeScreen() { + return Math.min(app.width, app.height) > 750 + } + function openWidget(params) { loadingDl.open() diff --git a/resources/shared/screenshots/SpeedFlowchartDemo/1.png b/resources/shared/screenshots/SpeedFlowchartDemo/1.png deleted file mode 100755 index 322c7a3..0000000 Binary files a/resources/shared/screenshots/SpeedFlowchartDemo/1.png and /dev/null differ diff --git a/resources/shared/screenshots/SpeedFlowchartDemo/2.png b/resources/shared/screenshots/SpeedFlowchartDemo/2.png deleted file mode 100755 index 37fddba..0000000 Binary files a/resources/shared/screenshots/SpeedFlowchartDemo/2.png and /dev/null differ diff --git a/resources/shared/screenshots/SpeedFlowchartDemo/3.png b/resources/shared/screenshots/SpeedFlowchartDemo/3.png deleted file mode 100755 index 7147779..0000000 Binary files a/resources/shared/screenshots/SpeedFlowchartDemo/3.png and /dev/null differ diff --git a/resources/shared/screenshots/SpeedFlowchartDemo/android/1.jpeg b/resources/shared/screenshots/SpeedFlowchartDemo/android/1.jpeg new file mode 100644 index 0000000..96e0e6e Binary files /dev/null and b/resources/shared/screenshots/SpeedFlowchartDemo/android/1.jpeg differ diff --git a/resources/shared/screenshots/SpeedFlowchartDemo/android/2.jpeg b/resources/shared/screenshots/SpeedFlowchartDemo/android/2.jpeg new file mode 100644 index 0000000..7c9e1c4 Binary files /dev/null and b/resources/shared/screenshots/SpeedFlowchartDemo/android/2.jpeg differ diff --git a/resources/shared/screenshots/SpeedFlowchartDemo/android/3.jpeg b/resources/shared/screenshots/SpeedFlowchartDemo/android/3.jpeg new file mode 100644 index 0000000..065d17b Binary files /dev/null and b/resources/shared/screenshots/SpeedFlowchartDemo/android/3.jpeg differ diff --git a/resources/shared/screenshots/SpeedFlowchartDemo/ios/1.jpeg b/resources/shared/screenshots/SpeedFlowchartDemo/ios/1.jpeg new file mode 100644 index 0000000..234edad Binary files /dev/null and b/resources/shared/screenshots/SpeedFlowchartDemo/ios/1.jpeg differ diff --git a/resources/shared/screenshots/SpeedFlowchartDemo/ios/2.jpeg b/resources/shared/screenshots/SpeedFlowchartDemo/ios/2.jpeg new file mode 100644 index 0000000..fba718d Binary files /dev/null and b/resources/shared/screenshots/SpeedFlowchartDemo/ios/2.jpeg differ diff --git a/resources/shared/screenshots/SpeedFlowchartDemo/ios/3.jpeg b/resources/shared/screenshots/SpeedFlowchartDemo/ios/3.jpeg new file mode 100644 index 0000000..0cda3c7 Binary files /dev/null and b/resources/shared/screenshots/SpeedFlowchartDemo/ios/3.jpeg differ diff --git a/resources/shared/screenshots/german/Screenshot_20190707-163801.png b/resources/shared/screenshots/german/Screenshot_20190707-163801.png deleted file mode 100755 index c4946cb..0000000 Binary files a/resources/shared/screenshots/german/Screenshot_20190707-163801.png and /dev/null differ diff --git a/resources/shared/screenshots/german/Screenshot_20190707-163809.png b/resources/shared/screenshots/german/Screenshot_20190707-163809.png deleted file mode 100755 index 273fe0b..0000000 Binary files a/resources/shared/screenshots/german/Screenshot_20190707-163809.png and /dev/null differ diff --git a/resources/shared/screenshots/german/Screenshot_20190707-163818.png b/resources/shared/screenshots/german/Screenshot_20190707-163818.png deleted file mode 100755 index 35f03af..0000000 Binary files a/resources/shared/screenshots/german/Screenshot_20190707-163818.png and /dev/null differ diff --git a/resources/shared/screenshots/german/Screenshot_20190707-163834.png b/resources/shared/screenshots/german/Screenshot_20190707-163834.png deleted file mode 100755 index 2a31590..0000000 Binary files a/resources/shared/screenshots/german/Screenshot_20190707-163834.png and /dev/null differ diff --git a/resources/shared/screenshots/german/Screenshot_20190707-163846.png b/resources/shared/screenshots/german/Screenshot_20190707-163846.png deleted file mode 100755 index 70e48af..0000000 Binary files a/resources/shared/screenshots/german/Screenshot_20190707-163846.png and /dev/null differ diff --git a/resources/shared/shared.qrc b/resources/shared/shared.qrc index e0c3508..5c58276 100644 --- a/resources/shared/shared.qrc +++ b/resources/shared/shared.qrc @@ -73,9 +73,12 @@ icons/bluerock/20x20@3/pinFilled.png icons/bluerock/20x20@4/pin.png icons/bluerock/20x20@4/pinFilled.png - screenshots/SpeedFlowchartDemo/1.png - screenshots/SpeedFlowchartDemo/2.png - screenshots/SpeedFlowchartDemo/3.png icons/blueRockHold.png + screenshots/SpeedFlowchartDemo/android/1.jpeg + screenshots/SpeedFlowchartDemo/android/2.jpeg + screenshots/SpeedFlowchartDemo/android/3.jpeg + screenshots/SpeedFlowchartDemo/ios/1.jpeg + screenshots/SpeedFlowchartDemo/ios/2.jpeg + screenshots/SpeedFlowchartDemo/ios/3.jpeg