diff --git a/qml/Components/FancyButton.qml b/qml/Components/FancyButton.qml index 46c1418..3855c65 100644 --- a/qml/Components/FancyButton.qml +++ b/qml/Components/FancyButton.qml @@ -28,6 +28,10 @@ Button { property real imageScale: 1 property color color: app.style.style.buttonColor + property int size: 100 + + height: control.size + width: control.size scale: control.pressed ? 0.8:1 @@ -37,7 +41,14 @@ Button { } } - background: Item { + onSizeChanged: { + + control.width = control.size + control.height = control.size + console.log("Button: size: " + control.size + " height: " + control.height + " width: " + control.width) + } + + background: Item { id: controlBackgroundContainer RectangularGlow { @@ -54,27 +65,30 @@ Button { Rectangle { id: controlBackground - anchors.fill: parent + anchors.centerIn: parent - radius: height * 0.5 + height: control.height + width: control.width + + radius: control.size * 0.5 color: control.color - - Image { - id: buttonIcon - source: control.image - - anchors.centerIn: parent - height: parent.height * 0.5 - width: height - - mipmap: true - - fillMode: Image.PreserveAspectFit - - scale: control.imageScale - } } } + Image { + id: buttonIcon + source: control.image + + anchors.centerIn: parent + height: parent.height * 0.5 + width: height + + mipmap: true + + fillMode: Image.PreserveAspectFit + + scale: control.imageScale + } + } diff --git a/qml/Forms/FilterForm.qml b/qml/Forms/FilterForm.qml index e4a326c..7fed3b6 100644 --- a/qml/Forms/FilterForm.qml +++ b/qml/Forms/FilterForm.qml @@ -159,7 +159,11 @@ Page { background: Rectangle { radius: 2 +<<<<<<< HEAD color: classLetterCb.Material.dialogColor//app.style.style.backgroundColor +======= + color: classLetterCb.Material.dialogColor +>>>>>>> origin/master layer.enabled: classLetterCb.enabled // layer.effect: ElevationEffect { @@ -305,8 +309,7 @@ Page { imageScale: 0 - height: 50 - width: height + size: 50 onClicked: { filterDialog.createContact() diff --git a/qml/Forms/HomeForm.qml b/qml/Forms/HomeForm.qml index 61c979f..5888f96 100644 --- a/qml/Forms/HomeForm.qml +++ b/qml/Forms/HomeForm.qml @@ -33,19 +33,18 @@ Page { Column { id: mainMenu - spacing: buttonWidth * 0.1 + spacing: buttonSize * 0.1 anchors { horizontalCenter: parent.horizontalCenter verticalCenter: parent.verticalCenter } - property int buttonHeight: app.landscape() ? root.height * (0.5*0.8):buttonWidth - property int buttonWidth: app.landscape() ? buttonHeight:root.width * (0.5*0.8) + property int buttonSize: app.landscape() ? root.height * (0.5*0.8):root.width * (0.5*0.8) Row { id: bigMenu - spacing: mainMenu.buttonWidth * 0.1 + spacing: mainMenu.buttonSize * 0.1 anchors.horizontalCenter: parent.horizontalCenter FancyButton { @@ -53,8 +52,7 @@ Page { image: "qrc:/graphics/icons/sheute.png" - width: mainMenu.buttonWidth - height: mainMenu.buttonHeight + size: mainMenu.buttonSize onClicked: { formStack.eventDay = 0 @@ -67,8 +65,7 @@ Page { image: "qrc:/graphics/icons/smorgen.png" - width: mainMenu.buttonWidth - height: mainMenu.buttonHeight + size: mainMenu.buttonSize onClicked: { formStack.eventDay = 1 @@ -81,20 +78,18 @@ Page { Grid { id: smallMenu columns: app.landscape() ? 4:2 - spacing: mainMenu.buttonWidth * 0.1 + spacing: mainMenu.buttonSize * 0.1 anchors.horizontalCenter: parent.horizontalCenter - property int buttonHeight: mainMenu.buttonHeight * 0.7 - property int buttonWidth: mainMenu.buttonWidth * 0.7 + property int buttonSize: mainMenu.buttonSize * 0.7 FancyButton { id: foodplanButton image: app.style.style.treffpunktFannyIcon - width: smallMenu.buttonWidth - height: smallMenu.buttonHeight + size: smallMenu.buttonSize onClicked: { formStack.push(foodPlanForm) @@ -107,8 +102,7 @@ Page { image: app.style.style.fannyLogo imageScale: 1.2 - width: smallMenu.buttonWidth - height: smallMenu.buttonHeight + size: smallMenu.buttonSize onClicked: { Qt.openUrlExternally("http://www.fanny-leicht.de") @@ -121,8 +115,7 @@ Page { image: app.style.style.settingsIcon imageScale: 0.8 - width: smallMenu.buttonWidth - height: smallMenu.buttonHeight + size: smallMenu.buttonSize onClicked: { formStack.push(settingsForm) @@ -135,8 +128,7 @@ Page { image: "qrc:/graphics/icons/logoutRed.png" imageScale: 0.8 - width: smallMenu.buttonWidth - height: smallMenu.buttonHeight + size: smallMenu.buttonSize onClicked: { logoutConfirmationDialog.open() diff --git a/release/android/15-1.0.1.apk b/release/android/fannyapp-15-1.0.1.apk similarity index 100% rename from release/android/15-1.0.1.apk rename to release/android/fannyapp-15-1.0.1.apk diff --git a/release/android/fannyapp-latest.apk b/release/android/fannyapp-latest.apk new file mode 100644 index 0000000..b23e63b Binary files /dev/null and b/release/android/fannyapp-latest.apk differ diff --git a/release/mac OS/fannyapp - 0.9.4.dmg b/release/mac OS/fannyapp-0.9.4.dmg similarity index 100% rename from release/mac OS/fannyapp - 0.9.4.dmg rename to release/mac OS/fannyapp-0.9.4.dmg diff --git a/release/mac OS/fannyapp.dmg b/release/mac OS/fannyapp-1.0.1.dmg similarity index 100% rename from release/mac OS/fannyapp.dmg rename to release/mac OS/fannyapp-1.0.1.dmg diff --git a/release/mac OS/fannyapp-latest.dmg b/release/mac OS/fannyapp-latest.dmg new file mode 100644 index 0000000..97c3394 Binary files /dev/null and b/release/mac OS/fannyapp-latest.dmg differ diff --git a/release/windows/fannyapp-setup.exe b/release/windows/fannyapp-0.9.4-setup.exe similarity index 100% rename from release/windows/fannyapp-setup.exe rename to release/windows/fannyapp-0.9.4-setup.exe diff --git a/release/windows/fannyapp-latest-setup.exe b/release/windows/fannyapp-latest-setup.exe new file mode 100644 index 0000000..4b54431 Binary files /dev/null and b/release/windows/fannyapp-latest-setup.exe differ