- Some updates to screenshots

- Added mode for large displays
This commit is contained in:
Dorian Zedler 2021-06-07 20:56:53 +02:00
parent 883ee82e29
commit f6cd1853ae
21 changed files with 33 additions and 13 deletions

View file

@ -1,7 +1,7 @@
QT += quick qml quickcontrols2 purchasing widgets QT += quick qml quickcontrols2 purchasing widgets
CONFIG += c++11 CONFIG += c++11
VERSION = 0.04 VERSION = 0.5.0
TARGET = blueROCK TARGET = blueROCK
# The following define makes your compiler emit warnings if you use # The following define makes your compiler emit warnings if you use

View file

@ -9,7 +9,7 @@ ItemDelegate {
property var thisData: widgetData[ "participants" ][partDel.ind] property var thisData: widgetData[ "participants" ][partDel.ind]
width: control.width width: control.width
height: app.landscape() ? 40:70 height: partDelCol.showSideBySide ? 40:70
text: "" text: ""
@ -44,11 +44,13 @@ ItemDelegate {
GridLayout { GridLayout {
id: partDelCol id: partDelCol
property bool showSideBySide: app.landscape() || app.largeScreen()
anchors.fill: parent anchors.fill: parent
anchors.margins: 5 anchors.margins: 5
columns: app.landscape() ? 2:1 columns: showSideBySide ? 2:1
rows: app.landscape()? 1:2 rows: showSideBySide ? 1:2
columnSpacing: height * 0.2 columnSpacing: height * 0.2
rowSpacing: 0 rowSpacing: 0
@ -110,8 +112,8 @@ ItemDelegate {
Row { Row {
id: partDelSecondRow id: partDelSecondRow
Layout.preferredWidth: app.landscape() ? parent.width * 0.5 : parent.width Layout.preferredWidth: partDelCol.showSideBySide ? parent.width * 0.5 : parent.width
Layout.preferredHeight: app.landscape() ? parent.height : parent.height * 0.5 Layout.preferredHeight: partDelCol.showSideBySide ? parent.height : parent.height * 0.5
visible: multiResRow.active || multiGenResRow.active || resultLa.acitve visible: multiResRow.active || multiGenResRow.active || resultLa.acitve

View file

@ -80,10 +80,16 @@ Rectangle {
} }
SwipeGallery { SwipeGallery {
property string platformIcons: Qt.platform.os === "osx" || Qt.platform.os === "iso" ? "ios":"android"
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: 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 { Button {
@ -99,6 +105,8 @@ Rectangle {
RowLayout { RowLayout {
Layout.alignment: Layout.Center
Button { Button {
id: restorePurchaseButton id: restorePurchaseButton
Layout.alignment: Layout.Center Layout.alignment: Layout.Center

View file

@ -8,8 +8,10 @@ Rectangle {
property var flowchartData: ({}) property var flowchartData: ({})
// always unlock in debug mode // always unlock in debug mode
//property bool unlocked: QT_DEBUG || appSettings.read("speedBackendPurchase") === "1"
property bool unlocked: appSettings.read("speedBackendPurchase") === "1" property bool unlocked: appSettings.read("speedBackendPurchase") === "1"
state: "hidden" state: "hidden"
anchors { anchors {

View file

@ -94,7 +94,7 @@ Page {
flat: true flat: true
font.bold: true font.bold: true
font.pixelSize: 15 font.pixelSize: aboutBluerockDisclaimerButton.font.pixelSize
text: "Where are the IFSC results?" text: "Where are the IFSC results?"
@ -102,9 +102,10 @@ Page {
} }
Button { Button {
flat: true id: aboutBluerockDisclaimerButton
font.pixelSize: 15 flat: true
font.pixelSize: bottomDigitalrockDisclaimerLabel.paintedHeight * 0.735
text: "About blueROCK" text: "About blueROCK"

View file

@ -507,6 +507,10 @@ Window {
return app.height < app.width return app.height < app.width
} }
function largeScreen() {
return Math.min(app.width, app.height) > 750
}
function openWidget(params) { function openWidget(params) {
loadingDl.open() loadingDl.open()

Binary file not shown.

Before

Width:  |  Height:  |  Size: 278 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 211 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 131 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 237 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 270 KiB

View file

@ -73,9 +73,12 @@
<file>icons/bluerock/20x20@3/pinFilled.png</file> <file>icons/bluerock/20x20@3/pinFilled.png</file>
<file>icons/bluerock/20x20@4/pin.png</file> <file>icons/bluerock/20x20@4/pin.png</file>
<file>icons/bluerock/20x20@4/pinFilled.png</file> <file>icons/bluerock/20x20@4/pinFilled.png</file>
<file>screenshots/SpeedFlowchartDemo/1.png</file>
<file>screenshots/SpeedFlowchartDemo/2.png</file>
<file>screenshots/SpeedFlowchartDemo/3.png</file>
<file>icons/blueRockHold.png</file> <file>icons/blueRockHold.png</file>
<file>screenshots/SpeedFlowchartDemo/android/1.jpeg</file>
<file>screenshots/SpeedFlowchartDemo/android/2.jpeg</file>
<file>screenshots/SpeedFlowchartDemo/android/3.jpeg</file>
<file>screenshots/SpeedFlowchartDemo/ios/1.jpeg</file>
<file>screenshots/SpeedFlowchartDemo/ios/2.jpeg</file>
<file>screenshots/SpeedFlowchartDemo/ios/3.jpeg</file>
</qresource> </qresource>
</RCC> </RCC>