diff --git a/qml/dialogues/FileDialogue.qml b/qml/dialogues/FileDialogue.qml index 67004248a3aac2490c1ca338c7adbf17c9b326b4..86beb37ba7064f4208b05ff6b4dd55205ccd2578 100644 --- a/qml/dialogues/FileDialogue.qml +++ b/qml/dialogues/FileDialogue.qml @@ -190,7 +190,7 @@ Dialog { (index === selectedFileIndex) ? datovkaPalette.highlight : datovkaPalette.window } width: fileList.width - height: imgHeight + height: imgHeightHeader RowLayout { anchors.fill: parent Text { diff --git a/qml/main.qml b/qml/main.qml index 62c18b561470832258d612e57e433296d93239f5..9c6c8240ca9f7f08f1e7ed47969063f26d76b5d6 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -91,7 +91,8 @@ ApplicationWindow { property int textPointSmall: Math.round(defaultTextFont.font.pointSize * 0.7) property int textFontSizeSmall: if (textPointSmall > 0) {textPointSmall} else {8} property int headerHeight: textFontSizeInPixels * 3 - property int imgHeight: headerHeight * 0.8 + property int imgHeightHeader: headerHeight * 0.6 + property int imgHeight: imgHeightHeader * 0.8 // inputItemHeight holds height of controls elements computed from font size property int inputItemHeight: headerHeight property int navImgHeight: headerHeight * 0.3 @@ -288,8 +289,8 @@ ApplicationWindow { Image{ id: datovkaLogo anchors.horizontalCenter: parent.horizontalCenter - width: imgHeight * 1.4 - height: imgHeight * 1.4 + width: imgHeightHeader * 1.4 + height: imgHeightHeader * 1.4 source: "qrc:/datovka.png" } Text { diff --git a/qml/pages/PageAboutApp.qml b/qml/pages/PageAboutApp.qml index 0bd7c7153786301c130013370ef1344bff46fa00..f0824a143028c5c940eab578cc53641f0ede5632 100644 --- a/qml/pages/PageAboutApp.qml +++ b/qml/pages/PageAboutApp.qml @@ -74,8 +74,8 @@ Item { Image{ id: datovkaLogo anchors.horizontalCenter: parent.horizontalCenter - width: imgHeight * 1.4 - height: imgHeight * 1.4 + width: imgHeightHeader * 1.4 + height: imgHeightHeader * 1.4 source: "qrc:/datovka.png" MouseArea { anchors.fill: parent @@ -134,7 +134,7 @@ Item { Image{ id: cznicLogo anchors.horizontalCenter: parent.horizontalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/cznic.png" MouseArea { anchors.fill: parent diff --git a/qml/pages/PageAccountDetail.qml b/qml/pages/PageAccountDetail.qml index 3bcf1936f3fd737ab121d8dade1f56e456a6ced3..dd001681188adb7b56d9b85bce9bbbe36458fd90 100644 --- a/qml/pages/PageAccountDetail.qml +++ b/qml/pages/PageAccountDetail.qml @@ -67,7 +67,7 @@ Component { anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right anchors.rightMargin: defaultMargin - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/sync.svg" MouseArea { anchors.fill: parent diff --git a/qml/pages/PageAccountList.qml b/qml/pages/PageAccountList.qml index d2fcd1a36408bb870ebf8e5df9f6c3bb6f25f160..26c1d423ecb9ae3c50100a111a10e55608dd0197 100644 --- a/qml/pages/PageAccountList.qml +++ b/qml/pages/PageAccountList.qml @@ -82,7 +82,7 @@ Component { anchors.left: parent.left anchors.leftMargin: defaultMargin anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/datovka@2x.png" MouseArea { anchors.fill: parent @@ -102,7 +102,7 @@ Component { Image { id: syncAllButton anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/sync-all.svg" MouseArea { anchors.fill: parent @@ -115,7 +115,7 @@ Component { Image { id: settingsButton anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/menu.svg" MouseArea { anchors.fill: parent @@ -195,7 +195,7 @@ Component { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: defaultMargin - sourceSize.height: imgHeight * 0.8 + sourceSize.height: imgHeightHeader source: "qrc:/ui/account-box.svg" } Rectangle { @@ -253,7 +253,7 @@ Component { anchors.right: parent.right anchors.rightMargin: defaultMargin anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/sync.svg" MouseArea { anchors.fill: parent @@ -293,7 +293,7 @@ Component { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: defaultMargin - sourceSize.height: imgHeight * 0.8 + sourceSize.height: imgHeightHeader source: "qrc:/ui/received-msgs.svg" } ColorOverlay { @@ -362,7 +362,7 @@ Component { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: defaultMargin - sourceSize.height: imgHeight * 0.8 + sourceSize.height: imgHeightHeader source: "qrc:/ui/sent-msgs.svg" } ColorOverlay { diff --git a/qml/pages/PageChangePassword.qml b/qml/pages/PageChangePassword.qml index 712b472e16c2356beeebecb801ddc994bc5cc9d3..dc3f5bff68090a9b2374e9166d9db0d16da67182 100644 --- a/qml/pages/PageChangePassword.qml +++ b/qml/pages/PageChangePassword.qml @@ -78,7 +78,7 @@ Item { Image { id: actionButton anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/checkbox-marked-circle.svg" MouseArea { anchors.fill: parent diff --git a/qml/pages/PageContactList.qml b/qml/pages/PageContactList.qml index ee28ae395268a65feafeb7270108b2d93e86fc02..59d64e818356138880b2b88d5bc1243bd3b56918 100644 --- a/qml/pages/PageContactList.qml +++ b/qml/pages/PageContactList.qml @@ -90,7 +90,7 @@ Item { Image { id: searchButton anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/magnify.svg" MouseArea { anchors.fill: parent diff --git a/qml/pages/PageDataboxSearch.qml b/qml/pages/PageDataboxSearch.qml index 11362c94949c4a89ac8737b62b5643a1707c87be..85b53e8198b41c4180f92ebf01e2b6ad0d425987 100644 --- a/qml/pages/PageDataboxSearch.qml +++ b/qml/pages/PageDataboxSearch.qml @@ -96,7 +96,7 @@ Item { id: searchButton visible: false anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/magnify.svg" MouseArea { anchors.fill: parent @@ -110,7 +110,7 @@ Item { Image { id: actionButton anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/account-search.svg" MouseArea { anchors.fill: parent diff --git a/qml/pages/PageMenuAccount.qml b/qml/pages/PageMenuAccount.qml index b0294a14c9d5af4f138f58e62ccea4c198d1681f..5c3f3907883b9ee403d33c8bfc3fa4cfd01b3c10 100644 --- a/qml/pages/PageMenuAccount.qml +++ b/qml/pages/PageMenuAccount.qml @@ -107,7 +107,7 @@ Component { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: defaultMargin - sourceSize.height: imgHeight * 0.7 + sourceSize.height: imgHeight source: image } ColorOverlay { diff --git a/qml/pages/PageMenuDatovkaSettings.qml b/qml/pages/PageMenuDatovkaSettings.qml index 577b68f844473dfcafbcac0f6e9a5454e442624f..4b3a1b2f3c9a4d7e8a7543a1248672fa2d95f76a 100644 --- a/qml/pages/PageMenuDatovkaSettings.qml +++ b/qml/pages/PageMenuDatovkaSettings.qml @@ -113,7 +113,7 @@ Component { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: defaultMargin - sourceSize.height: imgHeight * 0.7 + sourceSize.height: imgHeight source: image } ColorOverlay { diff --git a/qml/pages/PageMenuMessage.qml b/qml/pages/PageMenuMessage.qml index 06f623a03f91b8ecb81c5f70439b0810737c261f..bb6b30556c9d13c2843e5aa9cb3b9832d37ded8a 100644 --- a/qml/pages/PageMenuMessage.qml +++ b/qml/pages/PageMenuMessage.qml @@ -103,7 +103,7 @@ Component { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: defaultMargin - sourceSize.height: imgHeight * 0.7 + sourceSize.height: imgHeight source: image } ColorOverlay { diff --git a/qml/pages/PageMenuMessageDetail.qml b/qml/pages/PageMenuMessageDetail.qml index 9118957f4190bc9d688508149efc32fa0d54f516..9b51057163e05ea527ec05ffdfc386355d4feb06 100644 --- a/qml/pages/PageMenuMessageDetail.qml +++ b/qml/pages/PageMenuMessageDetail.qml @@ -119,7 +119,7 @@ Component { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: defaultMargin - sourceSize.height: imgHeight * 0.7 + sourceSize.height: imgHeight source: image } ColorOverlay { diff --git a/qml/pages/PageMenuMessageList.qml b/qml/pages/PageMenuMessageList.qml index b4d73ceadc92a8f942e78118cf0e2964ede0f333..7feb3c80633b1e9d4f0e6f4fc2a7ff641dfaa982 100644 --- a/qml/pages/PageMenuMessageList.qml +++ b/qml/pages/PageMenuMessageList.qml @@ -79,7 +79,7 @@ Component { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: defaultMargin - sourceSize.height: imgHeight * 0.7 + sourceSize.height: imgHeight source: image } ColorOverlay { diff --git a/qml/pages/PageMessageDetail.qml b/qml/pages/PageMessageDetail.qml index e7250c6363c3c4ce4d27e3034b35fb96a072e8e7..4235c2584368c292983e7a38d1d6c638d523a5c7 100644 --- a/qml/pages/PageMessageDetail.qml +++ b/qml/pages/PageMessageDetail.qml @@ -155,7 +155,7 @@ Component { Image { id: msgEmailButton anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/reply.svg" MouseArea { anchors.fill: parent @@ -167,7 +167,7 @@ Component { Image { id: attachmentSaveButon anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/save-to-disk.svg" MouseArea { anchors.fill: parent @@ -183,7 +183,7 @@ Component { Image { id: msgDownloadButton anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/datovka-email-download.svg" MouseArea { anchors.fill: parent @@ -197,7 +197,7 @@ Component { Image { id: attachmentMenuButon anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/menu.svg" MouseArea { anchors.fill: parent @@ -291,7 +291,7 @@ Component { id: imageAttachment anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader * 1.2 source: rFileIcon } Item { diff --git a/qml/pages/PageMessageList.qml b/qml/pages/PageMessageList.qml index ee5ea56b2d76b06f1495b97f3b46ec412bcb3910..d0da5b625d8eaef437ca186051185251b3cd8ffa 100644 --- a/qml/pages/PageMessageList.qml +++ b/qml/pages/PageMessageList.qml @@ -103,7 +103,7 @@ Component { Image { id: searchButton anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/magnify.svg" MouseArea { anchors.fill: parent @@ -117,7 +117,7 @@ Component { Image { id: settingsButton anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/menu.svg" MouseArea { anchors.fill: parent diff --git a/qml/pages/PageMessageSearch.qml b/qml/pages/PageMessageSearch.qml index 82ef99a708178bb360ea8c1f797c70faba9c944f..b2453361d6fd08c37be785e9fd5f25e8cdff7a82 100644 --- a/qml/pages/PageMessageSearch.qml +++ b/qml/pages/PageMessageSearch.qml @@ -75,7 +75,7 @@ Item { Image { id: actionButton anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/magnify.svg" MouseArea { anchors.fill: parent diff --git a/qml/pages/PageSendMessage.qml b/qml/pages/PageSendMessage.qml index 26ec4e0715ab6dff25695d76dd021814e634d4df..cef90b0fea4eb59f4d86f3a1e9885372a462f2a8 100644 --- a/qml/pages/PageSendMessage.qml +++ b/qml/pages/PageSendMessage.qml @@ -205,7 +205,7 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right anchors.rightMargin: defaultMargin - image.sourceSize.height: imgHeight + image.sourceSize.height: imgHeightHeader image.source: "qrc:/ui/send-msg.svg" MouseArea { anchors.fill: parent diff --git a/qml/pages/PageSettingsAccount.qml b/qml/pages/PageSettingsAccount.qml index 122abde1ecde1520e40af48230a870911719a5d6..20aa3eb142bcbcf31e93b17c748d2730b184b2a5 100644 --- a/qml/pages/PageSettingsAccount.qml +++ b/qml/pages/PageSettingsAccount.qml @@ -85,7 +85,7 @@ Item { Image { id: actionButton anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/checkbox-marked-circle.svg" MouseArea { anchors.fill: parent diff --git a/qml/pages/PageSettingsPin.qml b/qml/pages/PageSettingsPin.qml index 53bd16b48317abcebc6829b79f9e9b9c49519ddd..39cb2eb78f19d167472e4415223b9a19caf878c6 100644 --- a/qml/pages/PageSettingsPin.qml +++ b/qml/pages/PageSettingsPin.qml @@ -143,7 +143,7 @@ Item { Image { id: acceptElement anchors.verticalCenter: parent.verticalCenter - sourceSize.height: imgHeight + sourceSize.height: imgHeightHeader source: "qrc:/ui/checkbox-marked-circle.svg" MouseArea { anchors.fill: parent