diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-04-25 15:27:19 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-04-25 15:27:19 -0500 |
| commit | b0ba2379f4c657999510b054a22cb5c906e71e8a (patch) | |
| tree | 5d5c4d35786fb65052784fe6a70e3d08dac2eb01 /pages | |
| parent | 5887f87677b40b70b689e20056a57957157ed481 (diff) | |
| parent | 62285b01dc77ef14e4b5b9cc291e34162321ad89 (diff) | |
| download | monzero-gui-b0ba2379f4c657999510b054a22cb5c906e71e8a.tar.gz monzero-gui-b0ba2379f4c657999510b054a22cb5c906e71e8a.tar.xz monzero-gui-b0ba2379f4c657999510b054a22cb5c906e71e8a.zip | |
Merge pull request #2069
62285b0 Remove scaleRatio (xmrdsc)
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/Account.qml | 38 | ||||
| -rw-r--r-- | pages/AddressBook.qml | 36 | ||||
| -rw-r--r-- | pages/History.qml | 174 | ||||
| -rw-r--r-- | pages/Keys.qml | 50 | ||||
| -rw-r--r-- | pages/Mining.qml | 40 | ||||
| -rw-r--r-- | pages/Receive.qml | 46 | ||||
| -rw-r--r-- | pages/SharedRingDB.qml | 66 | ||||
| -rw-r--r-- | pages/Sign.qml | 58 | ||||
| -rw-r--r-- | pages/Transfer.qml | 34 | ||||
| -rw-r--r-- | pages/TxKey.qml | 68 | ||||
| -rw-r--r-- | pages/merchant/Merchant.qml | 116 | ||||
| -rw-r--r-- | pages/merchant/MerchantCheckbox.qml | 8 | ||||
| -rw-r--r-- | pages/merchant/MerchantTitlebar.qml | 2 | ||||
| -rw-r--r-- | pages/merchant/MerchantTrackingList.qml | 40 | ||||
| -rw-r--r-- | pages/settings/Navbar.qml | 22 | ||||
| -rw-r--r-- | pages/settings/SettingsInfo.qml | 84 | ||||
| -rw-r--r-- | pages/settings/SettingsLayout.qml | 22 | ||||
| -rw-r--r-- | pages/settings/SettingsLog.qml | 32 | ||||
| -rw-r--r-- | pages/settings/SettingsNode.qml | 76 | ||||
| -rw-r--r-- | pages/settings/SettingsWallet.qml | 72 |
20 files changed, 542 insertions, 542 deletions
diff --git a/pages/Account.qml b/pages/Account.qml index 0185b80c..851d8f20 100644 --- a/pages/Account.qml +++ b/pages/Account.qml @@ -64,14 +64,14 @@ Rectangle { /* main layout */ ColumnLayout { id: mainLayout - anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio - anchors.topMargin: 40 * scaleRatio + anchors.margins: (isMobile)? 17 : 20 + anchors.topMargin: 40 anchors.left: parent.left anchors.top: parent.top anchors.right: parent.right - spacing: 20 * scaleRatio + spacing: 20 ColumnLayout { id: balanceRow @@ -85,7 +85,7 @@ Rectangle { } RowLayout { - Layout.topMargin: 22 * scaleRatio + Layout.topMargin: 22 MoneroComponents.TextPlain { text: qsTr("Total balance: ") + translationManager.emptyString @@ -118,7 +118,7 @@ Rectangle { } RowLayout { - Layout.topMargin: 10 * scaleRatio + Layout.topMargin: 10 MoneroComponents.TextPlain { text: qsTr("Total unlocked balance: ") + translationManager.emptyString @@ -164,8 +164,8 @@ Rectangle { ColumnLayout { id: subaddressAccountListRow - property int subaddressAccountListItemHeight: 50 * scaleRatio - Layout.topMargin: 6 * scaleRatio + property int subaddressAccountListItemHeight: 50 + Layout.topMargin: 6 Layout.fillWidth: true Layout.minimumWidth: 240 Layout.preferredHeight: subaddressAccountListItemHeight * subaddressAccountListView.count @@ -202,8 +202,8 @@ Rectangle { Rectangle { anchors.fill: parent - anchors.topMargin: 5 * scaleRatio - anchors.rightMargin: 80 * scaleRatio + anchors.topMargin: 5 + anchors.rightMargin: 80 color: "transparent" MoneroComponents.Label { @@ -211,8 +211,8 @@ Rectangle { color: index === appWindow.current_subaddress_account_table_index ? MoneroComponents.Style.defaultFontColor : "#757575" anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - anchors.leftMargin: 6 * scaleRatio - fontSize: 14 * scaleRatio + anchors.leftMargin: 6 + fontSize: 14 fontBold: true text: "#" + index themeTransition: false @@ -223,8 +223,8 @@ Rectangle { color: MoneroComponents.Style.dimmedFontColor anchors.verticalCenter: parent.verticalCenter anchors.left: idLabel.right - anchors.leftMargin: 6 * scaleRatio - fontSize: 14 * scaleRatio + anchors.leftMargin: 6 + fontSize: 14 fontBold: true text: label elide: Text.ElideRight @@ -237,8 +237,8 @@ Rectangle { color: MoneroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter anchors.left: balanceLabel.left - anchors.leftMargin: (mainLayout.width < 510 ? -70 : -125) * scaleRatio - fontSize: 14 * scaleRatio + anchors.leftMargin: (mainLayout.width < 510 ? -70 : -125) + fontSize: 14 fontBold: true text: TxUtils.addressTruncate(address, mainLayout.width < 510 ? 3 : 6) themeTransition: false @@ -249,8 +249,8 @@ Rectangle { color: MoneroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter anchors.left: parent.right - anchors.leftMargin: (mainLayout.width < 510 ? -120 : -180) * scaleRatio - fontSize: 14 * scaleRatio + anchors.leftMargin: (mainLayout.width < 510 ? -120 : -180) + fontSize: 14 fontBold: true text: qsTr("Balance: ") + balance elide: mainLayout.width < 510 ? Text.ElideRight : Text.ElideNone @@ -339,10 +339,10 @@ Rectangle { border: false checkedIcon: "qrc:///images/plus-in-circle-medium-white.png" uncheckedIcon: "qrc:///images/plus-in-circle-medium-white.png" - fontSize: 14 * scaleRatio + fontSize: 14 iconOnTheLeft: true Layout.fillWidth: true - Layout.topMargin: 10 * scaleRatio + Layout.topMargin: 10 text: qsTr("Create new account") + translationManager.emptyString; onClicked: { inputDialog.labelText = qsTr("Set the label of the new account:") + translationManager.emptyString diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml index e605a5a7..864fcd52 100644 --- a/pages/AddressBook.qml +++ b/pages/AddressBook.qml @@ -51,14 +51,14 @@ Rectangle { ColumnLayout { id: mainLayout - anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio - anchors.topMargin: 40 * scaleRatio + anchors.margins: (isMobile)? 17 : 20 + anchors.topMargin: 40 anchors.left: parent.left anchors.top: parent.top anchors.right: parent.right - spacing: 20 * scaleRatio + spacing: 20 ColumnLayout { id: addressBookEmptyLayout @@ -71,7 +71,7 @@ Rectangle { Layout.fillWidth: true color: MoneroComponents.Style.defaultFontColor font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 32 * scaleRatio + font.pixelSize: 32 horizontalAlignment: TextInput.AlignLeft selectByMouse: false wrapMode: Text.WordWrap; @@ -94,7 +94,7 @@ Rectangle { Layout.fillWidth: true color: MoneroComponents.Style.dimmedFontColor font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 horizontalAlignment: TextInput.AlignLeft selectByMouse: false wrapMode: Text.WordWrap; @@ -130,13 +130,13 @@ Rectangle { MoneroComponents.Label { Layout.bottomMargin: 20 - fontSize: 32 * scaleRatio + fontSize: 32 text: qsTr("Address book") + translationManager.emptyString } ColumnLayout { id: addressBookListRow - property int addressBookListItemHeight: 50 * scaleRatio + property int addressBookListItemHeight: 50 Layout.fillWidth: true Layout.minimumWidth: 240 Layout.preferredHeight: addressBookListItemHeight * addressBookListView.count @@ -177,8 +177,8 @@ Rectangle { Rectangle { anchors.fill: parent - anchors.topMargin: 5 * scaleRatio - anchors.rightMargin: 110 * scaleRatio + anchors.topMargin: 5 + anchors.rightMargin: 110 color: "transparent" MoneroComponents.Label { @@ -186,8 +186,8 @@ Rectangle { color: MoneroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - anchors.leftMargin: 6 * scaleRatio - fontSize: 16 * scaleRatio + anchors.leftMargin: 6 + fontSize: 16 text: description elide: Text.ElideRight textWidth: addressLabel.x - descriptionLabel.x - 1 @@ -198,9 +198,9 @@ Rectangle { color: MoneroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter anchors.left: parent.right - anchors.leftMargin: -addressLabel.width - 5 * scaleRatio + anchors.leftMargin: -addressLabel.width - 5 - fontSize: 16 * scaleRatio + fontSize: 16 fontFamily: MoneroComponents.Style.fontMonoRegular.name; text: TxUtils.addressTruncatePretty(address, mainLayout.width < 540 ? 1 : (mainLayout.width < 700 ? 2 : 3)); } @@ -285,10 +285,10 @@ Rectangle { border: false checkedIcon: "qrc:///images/plus-in-circle-medium-white.png" uncheckedIcon: "qrc:///images/plus-in-circle-medium-white.png" - fontSize: 16 * scaleRatio + fontSize: 16 iconOnTheLeft: true Layout.fillWidth: true - Layout.topMargin: 10 * scaleRatio + Layout.topMargin: 10 text: qsTr("Add address") + translationManager.emptyString; onClicked: { root.showAddAddress(); @@ -302,7 +302,7 @@ Rectangle { spacing: 0 MoneroComponents.Label { - fontSize: 32 * scaleRatio + fontSize: 32 wrapMode: Text.WordWrap text: (root.editEntry ? qsTr("Edit an address") : qsTr("Add an address")) + translationManager.emptyString } @@ -424,7 +424,7 @@ Rectangle { Text { id: cancelButton Layout.leftMargin: 20 - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 font.bold: false color: MoneroComponents.Style.defaultFontColor text: qsTr("Cancel") + translationManager.emptyString @@ -441,7 +441,7 @@ Rectangle { id: deleteButton visible: root.editEntry Layout.leftMargin: 20 - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 font.bold: false color: MoneroComponents.Style.defaultFontColor text: qsTr("Delete") + translationManager.emptyString diff --git a/pages/History.qml b/pages/History.qml index 21a34f7c..ea53ea51 100644 --- a/pages/History.qml +++ b/pages/History.qml @@ -47,7 +47,7 @@ import "../js/TxUtils.js" as TxUtils Rectangle { id: root property var model - property int sideMargin: 50 * scaleRatio + property int sideMargin: 50 property var initialized: false property int txMax: 5 property int txOffset: 0 @@ -69,7 +69,7 @@ Rectangle { ColumnLayout { id: pageRoot - anchors.topMargin: 40 * scaleRatio + anchors.topMargin: 40 anchors.left: parent.left anchors.top: parent.top @@ -80,10 +80,10 @@ Rectangle { Layout.preferredWidth: parent.width - root.sideMargin Layout.leftMargin: sideMargin Layout.rightMargin: sideMargin - Layout.bottomMargin: 10 * scaleRatio + Layout.bottomMargin: 10 MoneroComponents.Label { - fontSize: 24 * scaleRatio + fontSize: 24 text: qsTr("Transactions") + translationManager.emptyString } @@ -97,12 +97,12 @@ Rectangle { Layout.alignment: Qt.AlignRight | Qt.AlignBottom Layout.preferredWidth: 100 Layout.preferredHeight: 15 - spacing: 8 * scaleRatio + spacing: 8 MoneroComponents.TextPlain { Layout.alignment: Qt.AlignVCenter font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: qsTr("Sort & filter") + translationManager.emptyString color: MoneroComponents.Style.defaultFontColor @@ -119,8 +119,8 @@ Rectangle { MoneroEffects.ImageMask { id: sortCollapsedIcon Layout.alignment: Qt.AlignVCenter - height: 8 * scaleRatio - width: 12 * scaleRatio + height: 8 + width: 12 image: "qrc:///images/whiteDropIndicator.png" fontAwesomeFallbackIcon: FontAwesome.arrowDown fontAwesomeFallbackSize: 14 @@ -141,7 +141,7 @@ Rectangle { ColumnLayout { Layout.fillWidth: true - Layout.topMargin: 8 * scaleRatio + Layout.topMargin: 8 Layout.leftMargin: sideMargin Layout.rightMargin: sideMargin visible: sortAndFilter.collapsed @@ -149,12 +149,12 @@ Rectangle { MoneroComponents.LineEdit { id: searchInput Layout.fillWidth: true - input.topPadding: 6 * scaleRatio - input.bottomPadding: 6 * scaleRatio - fontSize: 16 * scaleRatio - labelFontSize: 14 * scaleRatio + input.topPadding: 6 + input.bottomPadding: 6 + fontSize: 16 + labelFontSize: 14 placeholderText: qsTr("Search...") + translationManager.emptyString - placeholderFontSize: 16 * scaleRatio + placeholderFontSize: 16 inputHeight: 34 onTextUpdated: { if(searchInput.text != null && searchInput.text.length >= 3){ @@ -173,19 +173,19 @@ Rectangle { GridLayout { visible: sortAndFilter.collapsed Layout.fillWidth: true - Layout.topMargin: 4 * scaleRatio + Layout.topMargin: 4 Layout.leftMargin: sideMargin Layout.rightMargin: sideMargin columns: 2 - columnSpacing: 20 * scaleRatio + columnSpacing: 20 z: 6 MoneroComponents.DatePicker { id: fromDatePicker Layout.fillWidth: true - width: 100 * scaleRatio + width: 100 inputLabel.text: qsTr("Date from") + translationManager.emptyString - inputLabel.font.pixelSize: 14 * scaleRatio + inputLabel.font.pixelSize: 14 onCurrentDateChanged: { if(root.initialized){ root.reset(); @@ -197,7 +197,7 @@ Rectangle { MoneroComponents.DatePicker { id: toDatePicker Layout.fillWidth: true - width: 100 * scaleRatio + width: 100 inputLabel.text: qsTr("Date to") + translationManager.emptyString onCurrentDateChanged: { @@ -210,8 +210,8 @@ Rectangle { } RowLayout { - Layout.topMargin: 20 * scaleRatio - Layout.bottomMargin: 20 * scaleRatio + Layout.topMargin: 20 + Layout.bottomMargin: 20 Layout.fillWidth: true Layout.leftMargin: sideMargin Layout.rightMargin: sideMargin @@ -219,12 +219,12 @@ Rectangle { Rectangle { visible: sortAndFilter.collapsed color: "transparent" - Layout.preferredWidth: childrenRect.width + 38 * scaleRatio + Layout.preferredWidth: childrenRect.width + 38 Layout.preferredHeight: 20 MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: qsTr("Sort by") + ":" color: MoneroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter @@ -235,7 +235,7 @@ Rectangle { visible: sortAndFilter.collapsed id: sortBlockheight color: "transparent" - Layout.preferredWidth: sortBlockheightText.width + 42 * scaleRatio + Layout.preferredWidth: sortBlockheightText.width + 42 Layout.preferredHeight: 20 RowLayout { @@ -245,7 +245,7 @@ Rectangle { MoneroComponents.TextPlain { id: sortBlockheightText font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: qsTr("Blockheight") + translationManager.emptyString color: root.sortBy === "blockheight" ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor anchors.verticalCenter: parent.verticalCenter @@ -253,8 +253,8 @@ Rectangle { } MoneroEffects.ImageMask { - height: 8 * scaleRatio - width: 12 * scaleRatio + height: 8 + width: 12 visible: root.sortBy === "blockheight" ? true : false opacity: root.sortBy === "blockheight" ? 1 : 0.2 image: "qrc:///images/whiteDropIndicator.png" @@ -295,7 +295,7 @@ Rectangle { Rectangle { visible: sortAndFilter.collapsed color: "transparent" - Layout.preferredWidth: sortDateText.width + 42 * scaleRatio + Layout.preferredWidth: sortDateText.width + 42 Layout.preferredHeight: 20 RowLayout { @@ -305,7 +305,7 @@ Rectangle { MoneroComponents.TextPlain { id: sortDateText font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: qsTr("Date") + translationManager.emptyString color: root.sortBy === "timestamp" ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor themeTransition: false @@ -313,8 +313,8 @@ Rectangle { } MoneroEffects.ImageMask { - height: 8 * scaleRatio - width: 12 * scaleRatio + height: 8 + width: 12 visible: root.sortBy === "timestamp" ? true : false opacity: root.sortBy === "timestamp" ? 1 : 0.2 image: "qrc:///images/whiteDropIndicator.png" @@ -355,7 +355,7 @@ Rectangle { Rectangle { visible: sortAndFilter.collapsed color: "transparent" - Layout.preferredWidth: sortAmountText.width + 42 * scaleRatio + Layout.preferredWidth: sortAmountText.width + 42 Layout.preferredHeight: 20 RowLayout { @@ -365,7 +365,7 @@ Rectangle { MoneroComponents.TextPlain { id: sortAmountText font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: qsTr("Amount") + translationManager.emptyString color: root.sortBy === "amount" ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor themeTransition: false @@ -373,8 +373,8 @@ Rectangle { } MoneroEffects.ImageMask { - height: 8 * scaleRatio - width: 12 * scaleRatio + height: 8 + width: 12 visible: root.sortBy === "amount" ? true : false opacity: root.sortBy === "amount" ? 1 : 0.2 image: "qrc:///images/whiteDropIndicator.png" @@ -419,7 +419,7 @@ Rectangle { MoneroComponents.TextPlain { // status message font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: root.historyStatusMessage color: MoneroComponents.Style.defaultFontColor @@ -440,12 +440,12 @@ Rectangle { Rectangle { color: "transparent" - Layout.preferredWidth: childrenRect.width + 2 * scaleRatio + Layout.preferredWidth: childrenRect.width + 2 Layout.preferredHeight: 20 MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: qsTr("Page") + ":" color: MoneroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter @@ -454,9 +454,9 @@ Rectangle { Rectangle { color: "transparent" - Layout.preferredWidth: childrenRect.width + 10 * scaleRatio - Layout.leftMargin: 4 * scaleRatio - Layout.preferredHeight: 20 * scaleRatio + Layout.preferredWidth: childrenRect.width + 10 + Layout.leftMargin: 4 + Layout.preferredHeight: 20 MoneroComponents.TextPlain { id: paginationText @@ -496,8 +496,8 @@ Rectangle { Rectangle { id: paginationPrev - Layout.preferredWidth: 18 * scaleRatio - Layout.preferredHeight: 20 * scaleRatio + Layout.preferredWidth: 18 + Layout.preferredHeight: 20 color: "transparent" opacity: enabled ? 1.0 : 0.2 enabled: false @@ -506,8 +506,8 @@ Rectangle { id: prevIcon anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - height: 8 * scaleRatio - width: 12 * scaleRatio + height: 8 + width: 12 image: "qrc:///images/whiteDropIndicator.png" fontAwesomeFallbackIcon: FontAwesome.arrowDown fontAwesomeFallbackSize: 14 @@ -528,8 +528,8 @@ Rectangle { Rectangle { id: paginationNext - Layout.preferredWidth: 18 * scaleRatio - Layout.preferredHeight: 20 * scaleRatio + Layout.preferredWidth: 18 + Layout.preferredHeight: 20 color: "transparent" opacity: enabled ? 1.0 : 0.2 enabled: false @@ -538,8 +538,8 @@ Rectangle { id: nextIcon anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - height: 8 * scaleRatio - width: 12 * scaleRatio + height: 8 + width: 12 image: "qrc:///images/whiteDropIndicator.png" fontAwesomeFallbackIcon: FontAwesome.arrowDown fontAwesomeFallbackSize: 14 @@ -591,11 +591,11 @@ Rectangle { Rectangle { anchors.top: parent.top - anchors.topMargin: 24 * scaleRatio + anchors.topMargin: 24 anchors.horizontalCenter: parent.horizontalCenter - width: 10 * scaleRatio - height: 10 * scaleRatio - radius: 8 * scaleRatio + width: 10 + height: 10 + radius: 8 color: isout ? "#d85a00" : "#2eb358" } } @@ -633,7 +633,7 @@ Rectangle { MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: isout ? qsTr("Sent") : qsTr("Received") + translationManager.emptyString color: MoneroComponents.Style.historyHeaderTextColor anchors.verticalCenter: parent.verticalCenter @@ -649,7 +649,7 @@ Rectangle { MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: _amount + " XMR" color: MoneroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter @@ -683,7 +683,7 @@ Rectangle { MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: isout ? qsTr("Fee") : confirmationsRequired === 60 ? qsTr("Mined") : qsTr("Fee") + translationManager.emptyString color: MoneroComponents.Style.historyHeaderTextColor themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor @@ -699,7 +699,7 @@ Rectangle { MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: { if(!isout && confirmationsRequired === 60) return qsTr("Yes") + translationManager.emptyString; if(fee !== "") return fee + " XMR"; @@ -744,7 +744,7 @@ Rectangle { MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: qsTr("Blockheight") + translationManager.emptyString color: MoneroComponents.Style.historyHeaderTextColor themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor @@ -760,7 +760,7 @@ Rectangle { MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 text: blockheight > 0 ? blockheight : qsTr('Pending') + translationManager.emptyString; color: MoneroComponents.Style.defaultFontColor @@ -795,7 +795,7 @@ Rectangle { MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: qsTr("Confirmations") + translationManager.emptyString color: MoneroComponents.Style.historyHeaderTextColor themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor @@ -812,7 +812,7 @@ Rectangle { MoneroComponents.TextPlain { property bool confirmed: confirmations < confirmationsRequired ? false : true font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: confirmed ? confirmations : confirmations + "/" + confirmationsRequired color: MoneroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter @@ -852,7 +852,7 @@ Rectangle { MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: qsTr("Date") color: MoneroComponents.Style.historyHeaderTextColor themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor @@ -868,7 +868,7 @@ Rectangle { MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: persistentSettings.historyHumanDates ? dateHuman : date + " " + time color: MoneroComponents.Style.defaultFontColor @@ -909,8 +909,8 @@ Rectangle { text: FontAwesome.info small: true label.font.family: FontAwesome.fontFamily - fontSize: 18 * scaleRatio - width: 28 * scaleRatio + fontSize: 18 + width: 28 MouseArea { state: "details" @@ -926,7 +926,7 @@ Rectangle { Image { visible: !isout && confirmationsRequired === 60 anchors.left: btnDetails.right - anchors.leftMargin: 16 * scaleRatio + anchors.leftMargin: 16 width: 28 height: 28 source: "qrc:///images/miningxmr.png" @@ -935,12 +935,12 @@ Rectangle { MoneroComponents.StandardButton { visible: isout anchors.left: btnDetails.right - anchors.leftMargin: 10 * scaleRatio + anchors.leftMargin: 10 text: FontAwesome.productHunt small: true label.font.family: FontAwesome.fontFamily - fontSize: 18 * scaleRatio - width: 36 * scaleRatio + fontSize: 18 + width: 36 MouseArea { state: "proof" @@ -968,7 +968,7 @@ Rectangle { MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: qsTr("Description") + translationManager.emptyString color: MoneroComponents.Style.historyHeaderTextColor themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor @@ -985,7 +985,7 @@ Rectangle { MoneroComponents.TextPlain { id: txNoteText font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: tx_note !== "" ? tx_note : "-" color: MoneroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter @@ -1002,7 +1002,7 @@ Rectangle { MoneroEffects.ImageMask { anchors.top: parent.top anchors.left: txNoteText.right - anchors.leftMargin: 12 * scaleRatio + anchors.leftMargin: 12 image: "qrc:///images/edit.svg" fontAwesomeFallbackIcon: FontAwesome.pencilSquare fontAwesomeFallbackSize: 22 @@ -1036,7 +1036,7 @@ Rectangle { MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: qsTr("Transaction ID") + translationManager.emptyString color: MoneroComponents.Style.historyHeaderTextColor themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor @@ -1052,7 +1052,7 @@ Rectangle { MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: hash color: MoneroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter @@ -1080,7 +1080,7 @@ Rectangle { MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: qsTr("Transaction key") + translationManager.emptyString color: MoneroComponents.Style.historyHeaderTextColor themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor @@ -1096,7 +1096,7 @@ Rectangle { MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: { var txKey = currentWallet.getTxKey(hash) if(txKey) return txKey; @@ -1130,7 +1130,7 @@ Rectangle { MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: qsTr("Address sent to") + translationManager.emptyString color: MoneroComponents.Style.historyHeaderTextColor themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor @@ -1147,7 +1147,7 @@ Rectangle { MoneroComponents.TextPlain { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: { if(isout && address !== ""){ return TxUtils.addressTruncate(address, 24); @@ -1230,10 +1230,10 @@ Rectangle { MoneroEffects.ImageMask { id: collapsedIcon anchors.top: parent.top - anchors.topMargin: 24 * scaleRatio + anchors.topMargin: 24 anchors.horizontalCenter: parent.horizontalCenter - height: 8 * scaleRatio - width: 12 * scaleRatio + height: 8 + width: 12 image: "qrc:///images/whiteDropIndicator.png" rotation: delegate.collapsed ? 180 : 0 color: MoneroComponents.Style.defaultFontColor @@ -1272,8 +1272,8 @@ Rectangle { Item { visible: sortAndFilter.collapsed - Layout.topMargin: 10 * scaleRatio - Layout.bottomMargin: 10 * scaleRatio + Layout.topMargin: 10 + Layout.bottomMargin: 10 Layout.leftMargin: sideMargin Layout.rightMargin: sideMargin @@ -1282,7 +1282,7 @@ Rectangle { Layout.fillWidth: true Layout.alignment: Qt.AlignHCenter font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 text: root.historyStatusMessage; color: MoneroComponents.Style.dimmedFontColor themeTransitionBlackColor: MoneroComponents.Style._b_dimmedFontColor @@ -1292,8 +1292,8 @@ Rectangle { MoneroComponents.CheckBox2 { id: showAdvancedCheckbox - Layout.topMargin: 30 * scaleRatio - Layout.bottomMargin: 20 * scaleRatio + Layout.topMargin: 30 + Layout.bottomMargin: 20 Layout.leftMargin: sideMargin Layout.rightMargin: sideMargin checked: persistentSettings.historyShowAdvanced @@ -1305,7 +1305,7 @@ Rectangle { visible: persistentSettings.historyShowAdvanced Layout.leftMargin: sideMargin Layout.rightMargin: sideMargin - spacing: 20 * scaleRatio + spacing: 20 MoneroComponents.CheckBox { id: humanDatesCheckBox diff --git a/pages/Keys.qml b/pages/Keys.qml index e46b038d..ecde8db9 100644 --- a/pages/Keys.qml +++ b/pages/Keys.qml @@ -40,7 +40,7 @@ import "." 1.0 Rectangle { id: page property bool viewOnly: false - property int keysHeight: mainLayout.height + 100 * scaleRatio // Ensure sufficient height for QR code, even in minimum width window case. + property int keysHeight: mainLayout.height + 100 // Ensure sufficient height for QR code, even in minimum width window case. color: "transparent" @@ -52,10 +52,10 @@ Rectangle { anchors.top: parent.top anchors.right: parent.right - anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio - anchors.topMargin: 40 * scaleRatio + anchors.margins: (isMobile)? 17 : 20 + anchors.topMargin: 40 - spacing: 30 * scaleRatio + spacing: 30 Layout.fillWidth: true MoneroComponents.WarningBox { @@ -68,17 +68,17 @@ Rectangle { MoneroComponents.Label { Layout.fillWidth: true - fontSize: 22 * scaleRatio - Layout.topMargin: 10 * scaleRatio + fontSize: 22 + Layout.topMargin: 10 text: qsTr("Mnemonic seed") + translationManager.emptyString } Rectangle { Layout.fillWidth: true - height: 2 * scaleRatio + height: 2 color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity - Layout.bottomMargin: 10 * scaleRatio + Layout.bottomMargin: 10 } MoneroComponents.WarningBox { @@ -101,8 +101,8 @@ Rectangle { MoneroComponents.Label { Layout.fillWidth: true - fontSize: 22 * scaleRatio - Layout.topMargin: 10 * scaleRatio + fontSize: 22 + Layout.topMargin: 10 text: qsTr("Keys") + translationManager.emptyString } Rectangle { @@ -110,7 +110,7 @@ Rectangle { height: 2 color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity - Layout.bottomMargin: 10 * scaleRatio + Layout.bottomMargin: 10 } MoneroComponents.LineEdit { Layout.fillWidth: true @@ -118,34 +118,34 @@ Rectangle { readOnly: true copyButton: true labelText: qsTr("Secret view key") + translationManager.emptyString - fontSize: 16 * scaleRatio + fontSize: 16 } MoneroComponents.LineEdit { Layout.fillWidth: true - Layout.topMargin: 25 * scaleRatio + Layout.topMargin: 25 id: publicViewKey readOnly: true copyButton: true labelText: qsTr("Public view key") + translationManager.emptyString - fontSize: 16 * scaleRatio + fontSize: 16 } MoneroComponents.LineEdit { Layout.fillWidth: true - Layout.topMargin: 25 * scaleRatio + Layout.topMargin: 25 id: secretSpendKey readOnly: true copyButton: true labelText: qsTr("Secret spend key") + translationManager.emptyString - fontSize: 16 * scaleRatio + fontSize: 16 } MoneroComponents.LineEdit { Layout.fillWidth: true - Layout.topMargin: 25 * scaleRatio + Layout.topMargin: 25 id: publicSpendKey readOnly: true copyButton: true labelText: qsTr("Public spend key") + translationManager.emptyString - fontSize: 16 * scaleRatio + fontSize: 16 } } @@ -154,8 +154,8 @@ Rectangle { MoneroComponents.Label { Layout.fillWidth: true - fontSize: 22 * scaleRatio - Layout.topMargin: 10 * scaleRatio + fontSize: 22 + Layout.topMargin: 10 text: qsTr("Export wallet") + translationManager.emptyString } Rectangle { @@ -163,7 +163,7 @@ Rectangle { height: 2 color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity - Layout.bottomMargin: 10 * scaleRatio + Layout.bottomMargin: 10 } ColumnLayout { @@ -187,14 +187,14 @@ Rectangle { showFullQr.checked = false } } - Layout.bottomMargin: 30 * scaleRatio + Layout.bottomMargin: 30 } Image { visible: !viewOnlyQRCode.visible id: fullWalletQRCode Layout.fillWidth: true - Layout.minimumHeight: 180 * scaleRatio + Layout.minimumHeight: 180 smooth: false fillMode: Image.PreserveAspectFit } @@ -203,7 +203,7 @@ Rectangle { visible: false id: viewOnlyQRCode Layout.fillWidth: true - Layout.minimumHeight: 180 * scaleRatio + Layout.minimumHeight: 180 smooth: false fillMode: Image.PreserveAspectFit } @@ -211,7 +211,7 @@ Rectangle { MoneroComponents.TextPlain { Layout.fillWidth: true font.bold: true - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 color: MoneroComponents.Style.defaultFontColor text: (viewOnlyQRCode.visible) ? qsTr("View Only Wallet") + translationManager.emptyString : qsTr("Spendable Wallet") + translationManager.emptyString horizontalAlignment: Text.AlignHCenter diff --git a/pages/Mining.qml b/pages/Mining.qml index db980888..0695e2f2 100644 --- a/pages/Mining.qml +++ b/pages/Mining.qml @@ -40,27 +40,27 @@ Rectangle { ColumnLayout { id: mainLayout Layout.fillWidth: true - anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio - anchors.topMargin: 40 * scaleRatio + anchors.margins: (isMobile)? 17 : 20 + anchors.topMargin: 40 anchors.left: parent.left anchors.top: parent.top anchors.right: parent.right - spacing: 20 * scaleRatio + spacing: 20 MoneroComponents.Label { id: soloTitleLabel - fontSize: 24 * scaleRatio + fontSize: 24 text: qsTr("Solo mining") + translationManager.emptyString } MoneroComponents.WarningBox { - Layout.bottomMargin: 8 * scaleRatio + Layout.bottomMargin: 8 text: qsTr("Mining is only available on local daemons.") + translationManager.emptyString visible: !walletManager.isDaemonLocal(appWindow.currentDaemonAddress) } MoneroComponents.WarningBox { - Layout.bottomMargin: 8 * scaleRatio + Layout.bottomMargin: 8 text: qsTr("Your daemon must be synchronized before you can start mining") + translationManager.emptyString visible: walletManager.isDaemonLocal(appWindow.currentDaemonAddress) && !appWindow.daemonSynced } @@ -71,22 +71,22 @@ Rectangle { wrapMode: Text.Wrap Layout.fillWidth: true font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 color: MoneroComponents.Style.defaultFontColor } MoneroComponents.WarningBox { id: warningLabel - Layout.topMargin: 8 * scaleRatio - Layout.bottomMargin: 8 * scaleRatio + Layout.topMargin: 8 + Layout.bottomMargin: 8 text: qsTr("Mining may reduce the performance of other running applications and processes.") + translationManager.emptyString } GridLayout { columns: 2 Layout.fillWidth: true - columnSpacing: 20 * scaleRatio - rowSpacing: 16 * scaleRatio + columnSpacing: 20 + rowSpacing: 16 ColumnLayout { Layout.fillWidth: true @@ -96,18 +96,18 @@ Rectangle { id: soloMinerThreadsLabel color: MoneroComponents.Style.defaultFontColor text: qsTr("CPU threads") + translationManager.emptyString - fontSize: 16 * scaleRatio + fontSize: 16 wrapMode: Text.WordWrap } } ColumnLayout { Layout.fillWidth: true - spacing: 16 * scaleRatio + spacing: 16 MoneroComponents.LineEdit { id: soloMinerThreadsLine - Layout.minimumWidth: 200 * scaleRatio + Layout.minimumWidth: 200 text: "1" validator: IntValidator { bottom: 1; top: idealThreadCount } } @@ -117,7 +117,7 @@ Rectangle { text: qsTr("Max # of CPU threads available for mining: ") + idealThreadCount + translationManager.emptyString wrapMode: Text.WordWrap font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 color: MoneroComponents.Style.defaultFontColor } @@ -175,7 +175,7 @@ Rectangle { id: manageSoloMinerLabel color: MoneroComponents.Style.defaultFontColor text: qsTr("Manage miner") + translationManager.emptyString - fontSize: 16 * scaleRatio + fontSize: 16 wrapMode: Text.Wrap Layout.preferredWidth: manageSoloMinerLabel.textWidth } @@ -183,7 +183,7 @@ Rectangle { ColumnLayout { Layout.fillWidth: true - spacing: 16 * scaleRatio + spacing: 16 RowLayout { MoneroComponents.StandardButton { @@ -227,17 +227,17 @@ Rectangle { id: statusLabel color: MoneroComponents.Style.defaultFontColor text: qsTr("Status") + translationManager.emptyString - fontSize: 16 * scaleRatio + fontSize: 16 } } ColumnLayout { Layout.fillWidth: true - spacing: 16 * scaleRatio + spacing: 16 MoneroComponents.LineEditMulti { id: statusText - Layout.minimumWidth: 300 * scaleRatio + Layout.minimumWidth: 300 text: qsTr("Not mining") + translationManager.emptyString borderDisabled: true readOnly: true diff --git a/pages/Receive.qml b/pages/Receive.qml index e31a79d7..d24ac7c2 100644 --- a/pages/Receive.qml +++ b/pages/Receive.qml @@ -65,18 +65,18 @@ Rectangle { /* main layout */ ColumnLayout { id: mainLayout - anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio - anchors.topMargin: 40 * scaleRatio + anchors.margins: (isMobile)? 17 : 20 + anchors.topMargin: 40 anchors.left: parent.left anchors.top: parent.top anchors.right: parent.right - spacing: 20 * scaleRatio - property int labelWidth: 120 * scaleRatio - property int editWidth: 400 * scaleRatio - property int lineEditFontSize: 12 * scaleRatio - property int qrCodeSize: 220 * scaleRatio + spacing: 20 + property int labelWidth: 120 + property int editWidth: 400 + property int lineEditFontSize: 12 + property int qrCodeSize: 220 ColumnLayout { id: addressRow @@ -90,8 +90,8 @@ Rectangle { ColumnLayout { id: subaddressListRow - property int subaddressListItemHeight: 50 * scaleRatio - Layout.topMargin: 6 * scaleRatio + property int subaddressListItemHeight: 50 + Layout.topMargin: 6 Layout.fillWidth: true Layout.minimumWidth: 240 Layout.preferredHeight: subaddressListItemHeight * subaddressListView.count @@ -136,8 +136,8 @@ Rectangle { color: index === appWindow.current_subaddress_table_index ? MoneroComponents.Style.defaultFontColor : "#757575" anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - anchors.leftMargin: 6 * scaleRatio - fontSize: 14 * scaleRatio + anchors.leftMargin: 6 + fontSize: 14 fontBold: true text: "#" + index themeTransition: false @@ -148,8 +148,8 @@ Rectangle { color: MoneroComponents.Style.dimmedFontColor anchors.verticalCenter: parent.verticalCenter anchors.left: idLabel.right - anchors.leftMargin: 6 * scaleRatio - fontSize: 14 * scaleRatio + anchors.leftMargin: 6 + fontSize: 14 fontBold: true text: label elide: Text.ElideRight @@ -162,8 +162,8 @@ Rectangle { color: MoneroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter anchors.left: parent.right - anchors.leftMargin: (mainLayout.width < 510 ? -130 : -190) * scaleRatio - fontSize: 14 * scaleRatio + anchors.leftMargin: (mainLayout.width < 510 ? -130 : -190) + fontSize: 14 fontBold: true text: TxUtils.addressTruncate(address, mainLayout.width < 510 ? 6 : 10) themeTransition: false @@ -186,8 +186,8 @@ Rectangle { opacity: 0.5 anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - anchors.rightMargin: 30 * scaleRatio - anchors.topMargin: 1 * scaleRatio + anchors.rightMargin: 30 + anchors.topMargin: 1 width: 23 height: 21 visible: index !== 0 @@ -242,10 +242,10 @@ Rectangle { border: false checkedIcon: "qrc:///images/plus-in-circle-medium-white.png" uncheckedIcon: "qrc:///images/plus-in-circle-medium-white.png" - fontSize: 14 * scaleRatio + fontSize: 14 iconOnTheLeft: true Layout.fillWidth: true - Layout.topMargin: 10 * scaleRatio + Layout.topMargin: 10 text: qsTr("Create new address") + translationManager.emptyString; onClicked: { inputDialog.labelText = qsTr("Set the label of the new address:") + translationManager.emptyString @@ -262,8 +262,8 @@ Rectangle { ColumnLayout { Layout.alignment: Qt.AlignHCenter - spacing: 11 * scaleRatio - property int qrSize: 220 * scaleRatio + spacing: 11 + property int qrSize: 220 Rectangle { id: qrContainer @@ -271,12 +271,12 @@ Rectangle { Layout.fillWidth: true Layout.maximumWidth: parent.qrSize Layout.preferredHeight: width - radius: 4 * scaleRatio + radius: 4 Image { id: qrCode anchors.fill: parent - anchors.margins: 1 * scaleRatio + anchors.margins: 1 smooth: false fillMode: Image.PreserveAspectFit diff --git a/pages/SharedRingDB.qml b/pages/SharedRingDB.qml index 4a353879..48cead73 100644 --- a/pages/SharedRingDB.qml +++ b/pages/SharedRingDB.qml @@ -80,14 +80,14 @@ Rectangle { ColumnLayout { id: mainLayout Layout.fillWidth: true - anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio - anchors.topMargin: 40 * scaleRatio + anchors.margins: (isMobile)? 17 : 20 + anchors.topMargin: 40 anchors.left: parent.left anchors.top: parent.top anchors.right: parent.right - spacing: 20 * scaleRatio + spacing: 20 MessageDialog { id: sharedRingDBDialog @@ -96,7 +96,7 @@ Rectangle { MoneroComponents.Label { id: signTitleLabel - fontSize: 24 * scaleRatio + fontSize: 24 text: qsTr("Shared RingDB") + translationManager.emptyString } @@ -106,7 +106,7 @@ Rectangle { wrapMode: Text.Wrap Layout.fillWidth: true font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 color: MoneroComponents.Style.defaultFontColor } @@ -137,7 +137,7 @@ Rectangle { MoneroComponents.TextPlain { textFormat: Text.RichText font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 text: qsTr("This sets which outputs are known to be spent, and thus not to be used as privacy placeholders in ring signatures. ") + qsTr("You should only have to load a file when you want to refresh the list. Manual adding/removing is possible if needed.") + translationManager.emptyString wrapMode: Text.Wrap @@ -163,10 +163,10 @@ Rectangle { MoneroComponents.LineEdit { id: loadBlackballFileLine Layout.fillWidth: true - fontSize: 16 * scaleRatio - placeholderFontSize: 16 * scaleRatio + fontSize: 16 + placeholderFontSize: 16 placeholderText: qsTr("Path to file") + "..." + translationManager.emptyString - labelFontSize: 14 * scaleRatio + labelFontSize: 14 labelText: qsTr("Filename with outputs to mark as spent") + ":" + translationManager.emptyString copyButton: true readOnly: false @@ -198,15 +198,15 @@ Rectangle { GridLayout { Layout.fillWidth: true - columnSpacing: 20 * scaleRatio + columnSpacing: 20 MoneroComponents.LineEdit { id: blackballOutputAmountLine Layout.fillWidth: true - fontSize: 16 * scaleRatio - labelFontSize: 14 * scaleRatio + fontSize: 16 + labelFontSize: 14 labelText: qsTr("Or manually mark a single output as spent/unspent:") + translationManager.emptyString - placeholderFontSize: 16 * scaleRatio + placeholderFontSize: 16 placeholderText: qsTr("Paste output amount") + "..." + translationManager.emptyString readOnly: false validator: IntValidator { bottom: 0 } @@ -215,10 +215,10 @@ Rectangle { MoneroComponents.LineEdit { id: blackballOutputOffsetLine Layout.fillWidth: true - fontSize: 16 * scaleRatio - labelFontSize: 14 * scaleRatio + fontSize: 16 + labelFontSize: 14 labelText: " " - placeholderFontSize: 16 * scaleRatio + placeholderFontSize: 16 placeholderText: qsTr("Paste output offset") + "..." + translationManager.emptyString readOnly: false validator: IntValidator { bottom: 0 } @@ -248,7 +248,7 @@ Rectangle { MoneroComponents.LabelSubheader { Layout.fillWidth: true - Layout.topMargin: 24 * scaleRatio + Layout.topMargin: 24 textFormat: Text.RichText text: "<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style>" + qsTr("Rings") + " <a href='#'>" + qsTr("Help") + "</a>" + translationManager.emptyString @@ -275,7 +275,7 @@ Rectangle { MoneroComponents.TextPlain { textFormat: Text.RichText font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 text: qsTr("This records rings used by outputs spent on Monero on a key reusing chain, so that the same ring may be reused to avoid privacy issues.") + translationManager.emptyString wrapMode: Text.Wrap Layout.fillWidth: true; @@ -285,27 +285,27 @@ Rectangle { MoneroComponents.LineEdit { id: keyImageLine Layout.fillWidth: true - fontSize: 16 * scaleRatio - labelFontSize: 14 * scaleRatio + fontSize: 16 + labelFontSize: 14 labelText: qsTr("Key image") + ":" + translationManager.emptyString - placeholderFontSize: 16 * scaleRatio + placeholderFontSize: 16 placeholderText: qsTr("Paste key image") + "..." + translationManager.emptyString readOnly: false copyButton: true } GridLayout{ - Layout.topMargin: 12 * scaleRatio + Layout.topMargin: 12 columns: (isMobile) ? 1 : 2 - columnSpacing: 32 * scaleRatio + columnSpacing: 32 ColumnLayout { RowLayout { MoneroComponents.LineEdit { id: getRingLine Layout.fillWidth: true - fontSize: 16 * scaleRatio - labelFontSize: 14 * scaleRatio + fontSize: 16 + labelFontSize: 14 labelText: qsTr("Get ring") + ":" + translationManager.emptyString readOnly: true copyButton: true @@ -339,9 +339,9 @@ Rectangle { MoneroComponents.LineEdit { id: setRingLine Layout.fillWidth: true - fontSize: 16 * scaleRatio - labelFontSize: 14 * scaleRatio - placeholderFontSize: 16 * scaleRatio + fontSize: 16 + labelFontSize: 14 + placeholderFontSize: 16 labelText: qsTr("Set ring") + ":" + translationManager.emptyString readOnly: false copyButton: true @@ -367,7 +367,7 @@ Rectangle { } GridLayout { - columnSpacing: 20 * scaleRatio + columnSpacing: 20 columns: (isMobile) ? 1 : 2 MoneroComponents.CheckBox { @@ -404,17 +404,17 @@ Rectangle { GridLayout { id: segregationHeightRow Layout.fillWidth: true - Layout.topMargin: 17 * scaleRatio + Layout.topMargin: 17 columns: (isMobile) ? 1 : 2 - columnSpacing: 32 * scaleRatio + columnSpacing: 32 MoneroComponents.LineEdit { id: segregationHeightLine property bool edited: false Layout.fillWidth: true - placeholderFontSize: 16 * scaleRatio - labelFontSize: 14 * scaleRatio + placeholderFontSize: 16 + labelFontSize: 14 labelText: qsTr("Set segregation height:") + translationManager.emptyString validator: IntValidator { bottom: 0 } readOnly: false diff --git a/pages/Sign.qml b/pages/Sign.qml index 9d26bcd0..78192a70 100644 --- a/pages/Sign.qml +++ b/pages/Sign.qml @@ -87,17 +87,17 @@ Rectangle { ColumnLayout { id: mainLayout Layout.fillWidth: true - anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio - anchors.topMargin: 40 * scaleRatio + anchors.margins: (isMobile)? 17 : 20 + anchors.topMargin: 40 anchors.left: parent.left anchors.top: parent.top anchors.right: parent.right - spacing: 20 * scaleRatio + spacing: 20 MoneroComponents.Label { - fontSize: 24 * scaleRatio + fontSize: 24 text: qsTr("Sign/verify") + translationManager.emptyString } @@ -106,7 +106,7 @@ Rectangle { wrapMode: Text.Wrap Layout.fillWidth: true font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 color: MoneroComponents.Style.defaultFontColor } @@ -117,18 +117,18 @@ Rectangle { MoneroComponents.TextPlain { id: modeText Layout.fillWidth: true - Layout.topMargin: 12 * scaleRatio + Layout.topMargin: 12 text: qsTr("Mode") + translationManager.emptyString wrapMode: Text.Wrap font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 20 * scaleRatio + font.pixelSize: 20 textFormat: Text.RichText color: MoneroComponents.Style.defaultFontColor } RowLayout { id: modeButtonsRow - Layout.topMargin: 10 * scaleRatio + Layout.topMargin: 10 MoneroComponents.StandardButton { id: handleMessageButton @@ -154,12 +154,12 @@ Rectangle { ColumnLayout { id: signSection - spacing: 10 * scaleRatio + spacing: 10 MoneroComponents.LabelSubheader { Layout.fillWidth: true - Layout.topMargin: 12 * scaleRatio - Layout.bottomMargin: 24 * scaleRatio + Layout.topMargin: 12 + Layout.bottomMargin: 24 textFormat: Text.RichText text: fileMode ? qsTr("Sign file") + translationManager.emptyString : qsTr("Sign message") + translationManager.emptyString } @@ -167,15 +167,15 @@ Rectangle { ColumnLayout{ id: signMessageRow Layout.fillWidth: true - spacing: 10 * scaleRatio + spacing: 10 visible: messageMode MoneroComponents.LineEditMulti{ id: signMessageLine Layout.fillWidth: true - labelFontSize: 14 * scaleRatio + labelFontSize: 14 labelText: qsTr("Message") + translationManager.emptyString; - placeholderFontSize: 16 * scaleRatio + placeholderFontSize: 16 placeholderText: qsTr("Enter a message to sign") + translationManager.emptyString; readOnly: false onTextChanged: signSignatureLine.text = '' @@ -191,9 +191,9 @@ Rectangle { MoneroComponents.LineEditMulti { id: signFileLine - labelFontSize: 14 * scaleRatio + labelFontSize: 14 labelText: qsTr("File") + translationManager.emptyString - placeholderFontSize: 16 * scaleRatio + placeholderFontSize: 16 placeholderText: qsTr("Enter path to file") + translationManager.emptyString; readOnly: false Layout.fillWidth: true @@ -219,9 +219,9 @@ Rectangle { MoneroComponents.LineEditMulti { id: signSignatureLine - labelFontSize: 14 * scaleRatio + labelFontSize: 14 labelText: qsTr("Signature") + translationManager.emptyString - placeholderFontSize: 16 * scaleRatio + placeholderFontSize: 16 placeholderText: messageMode ? qsTr("Click [Sign Message] to generate signature") + translationManager.emptyString : qsTr("Click [Sign File] to generate signature") + translationManager.emptyString; readOnly: true Layout.fillWidth: true @@ -275,11 +275,11 @@ Rectangle { ColumnLayout { id: verifySection - spacing: 16 * scaleRatio + spacing: 16 MoneroComponents.LabelSubheader { Layout.fillWidth: true - Layout.bottomMargin: 24 * scaleRatio + Layout.bottomMargin: 24 textFormat: Text.RichText text: fileMode ? qsTr("Verify file") + translationManager.emptyString : qsTr("Verify message") + translationManager.emptyString } @@ -288,9 +288,9 @@ Rectangle { id: verifyMessageLine visible: messageMode Layout.fillWidth: true - labelFontSize: 14 * scaleRatio + labelFontSize: 14 labelText: qsTr("Message") + translationManager.emptyString - placeholderFontSize: 16 * scaleRatio + placeholderFontSize: 16 placeholderText: qsTr("Enter the message to verify") + translationManager.emptyString readOnly: false wrapMode: Text.WrapAnywhere @@ -305,9 +305,9 @@ Rectangle { MoneroComponents.LineEditMulti { id: verifyFileLine - labelFontSize: 14 * scaleRatio + labelFontSize: 14 labelText: qsTr("File") + translationManager.emptyString - placeholderFontSize: 16 * scaleRatio + placeholderFontSize: 16 placeholderText: qsTr("Enter path to file") + translationManager.emptyString readOnly: false Layout.fillWidth: true @@ -330,10 +330,10 @@ Rectangle { MoneroComponents.LineEditMulti { id: verifyAddressLine Layout.fillWidth: true - labelFontSize: 14 * scaleRatio + labelFontSize: 14 labelText: qsTr("Address") + translationManager.emptyString addressValidation: true - placeholderFontSize: 16 * scaleRatio + placeholderFontSize: 16 placeholderText: qsTr("Enter the Monero Address (example: 44AFFq5kSiGBoZ...)") + translationManager.emptyString wrapMode: Text.WrapAnywhere text: '' @@ -342,9 +342,9 @@ Rectangle { MoneroComponents.LineEditMulti { id: verifySignatureLine - labelFontSize: 14 * scaleRatio + labelFontSize: 14 labelText: qsTr("Signature") + translationManager.emptyString - placeholderFontSize: 16 * scaleRatio + placeholderFontSize: 16 placeholderText: qsTr("Enter the signature to verify") + translationManager.emptyString Layout.fillWidth: true pasteButton: true @@ -354,7 +354,7 @@ Rectangle { RowLayout{ Layout.fillWidth: true - Layout.topMargin: 12 * scaleRatio + Layout.topMargin: 12 Layout.alignment: Qt.AlignRight MoneroComponents.StandardButton { diff --git a/pages/Transfer.qml b/pages/Transfer.qml index b4563c7c..6a8ea1be 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -107,14 +107,14 @@ Rectangle { ColumnLayout { id: pageRoot - anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio - anchors.topMargin: 40 * scaleRatio + anchors.margins: (isMobile)? 17 : 20 + anchors.topMargin: 40 anchors.left: parent.left anchors.top: parent.top anchors.right: parent.right - spacing: 30 * scaleRatio + spacing: 30 RowLayout { visible: root.warningContent !== "" @@ -134,7 +134,7 @@ Rectangle { ColumnLayout { Layout.fillWidth: true - Layout.minimumWidth: 200 * scaleRatio + Layout.minimumWidth: 200 // Amount input LineEdit { @@ -149,7 +149,7 @@ Rectangle { appWindow.showPageRequest("Account") } placeholderText: "0.00" - width: 100 * scaleRatio + width: 100 fontBold: true inlineButtonText: qsTr("All") + translationManager.emptyString inlineButton.onClicked: amountLine.text = "(all)" @@ -169,10 +169,10 @@ Rectangle { Layout.fillWidth: true Label { id: transactionPriority - Layout.topMargin: 12 * scaleRatio + Layout.topMargin: 12 text: qsTr("Transaction priority") + translationManager.emptyString fontBold: false - fontSize: 16 * scaleRatio + fontSize: 16 } // Note: workaround for translations in listElements // ListElement: cannot use script for property value, so @@ -195,7 +195,7 @@ Rectangle { StandardDropdown { Layout.fillWidth: true id: priorityDropdown - Layout.topMargin: 5 * scaleRatio + Layout.topMargin: 5 currentIndex: 0 } } @@ -259,7 +259,7 @@ Rectangle { StandardButton { id: resolveButton - width: 80 * scaleRatio + width: 80 text: qsTr("Resolve") + translationManager.emptyString visible: TxUtils.isValidOpenAliasAddress(addressLine.text) enabled : visible @@ -311,8 +311,8 @@ Rectangle { border: false checkedIcon: "qrc:///images/minus-white.png" uncheckedIcon: "qrc:///images/plus-white.png" - imgWidth: 12 * scaleRatio - imgHeight: 12 * scaleRatio + imgWidth: 12 + imgHeight: 12 fontSize: paymentIdLine.labelFontSize iconOnTheLeft: false Layout.fillWidth: true @@ -342,8 +342,8 @@ Rectangle { border: false checkedIcon: "qrc:///images/minus-white.png" uncheckedIcon: "qrc:///images/plus-white.png" - imgWidth: 12 * scaleRatio - imgHeight: 12 * scaleRatio + imgWidth: 12 + imgHeight: 12 fontSize: descriptionLine.labelFontSize iconOnTheLeft: false Layout.fillWidth: true @@ -384,7 +384,7 @@ Rectangle { id: sendButton rightIcon: "qrc:///images/rightArrow.png" rightIconInactive: "qrc:///images/rightArrowInactive.png" - Layout.topMargin: 4 * scaleRatio + Layout.topMargin: 4 text: qsTr("Send") + translationManager.emptyString enabled: { updateSendButton() @@ -433,9 +433,9 @@ Rectangle { anchors.top: pageRoot.bottom anchors.left: parent.left anchors.right: parent.right - anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio - anchors.topMargin: 32 * scaleRatio - spacing: 26 * scaleRatio + anchors.margins: (isMobile)? 17 : 20 + anchors.topMargin: 32 + spacing: 26 enabled: !viewOnly || pageRoot.enabled RowLayout { diff --git a/pages/TxKey.qml b/pages/TxKey.qml index 4681df27..5a53b7b0 100644 --- a/pages/TxKey.qml +++ b/pages/TxKey.qml @@ -45,21 +45,21 @@ Rectangle { /* main layout */ ColumnLayout { id: mainLayout - anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio - anchors.topMargin: 40 * scaleRatio + anchors.margins: (isMobile)? 17 : 20 + anchors.topMargin: 40 anchors.left: parent.left anchors.top: parent.top anchors.right: parent.right - spacing: 20 * scaleRatio + spacing: 20 // solo ColumnLayout { id: soloBox - spacing: 20 * scaleRatio + spacing: 20 MoneroComponents.Label { id: soloTitleLabel - fontSize: 24 * scaleRatio + fontSize: 24 text: qsTr("Prove Transaction") + translationManager.emptyString } @@ -69,17 +69,17 @@ Rectangle { "For the case of outgoing payments, you can get a 'Spend Proof' that proves the authorship of a transaction. In this case, you don't need to specify the recipient address.") + translationManager.emptyString wrapMode: Text.Wrap font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 color: MoneroComponents.Style.defaultFontColor } MoneroComponents.LineEdit { id: getProofTxIdLine Layout.fillWidth: true - labelFontSize: 14 * scaleRatio + labelFontSize: 14 labelText: qsTr("Transaction ID") + translationManager.emptyString - fontSize: 16 * scaleRatio - placeholderFontSize: 16 * scaleRatio + fontSize: 16 + placeholderFontSize: 16 placeholderText: qsTr("Paste tx ID") + translationManager.emptyString readOnly: false copyButton: true @@ -88,10 +88,10 @@ Rectangle { MoneroComponents.LineEdit { id: getProofAddressLine Layout.fillWidth: true - labelFontSize: 14 * scaleRatio + labelFontSize: 14 labelText: qsTr("Address") + translationManager.emptyString - fontSize: 16 * scaleRatio - placeholderFontSize: 16 * scaleRatio + fontSize: 16 + placeholderFontSize: 16 placeholderText: qsTr("Recipient's wallet address") + translationManager.emptyString; readOnly: false copyButton: true @@ -100,17 +100,17 @@ Rectangle { MoneroComponents.LineEdit { id: getProofMessageLine Layout.fillWidth: true - fontSize: 16 * scaleRatio - labelFontSize: 14 * scaleRatio + fontSize: 16 + labelFontSize: 14 labelText: qsTr("Message") + translationManager.emptyString - placeholderFontSize: 16 * scaleRatio + placeholderFontSize: 16 placeholderText: qsTr("Optional message against which the signature is signed") + translationManager.emptyString; readOnly: false copyButton: true } MoneroComponents.StandardButton { - Layout.topMargin: 16 * scaleRatio + Layout.topMargin: 16 small: true text: qsTr("Generate") + translationManager.emptyString enabled: TxUtils.checkTxID(getProofTxIdLine.text) && (getProofAddressLine.text.length == 0 || TxUtils.checkAddress(getProofAddressLine.text, appWindow.persistentSettings.nettype)) @@ -127,12 +127,12 @@ Rectangle { opacity: MoneroComponents.Style.dividerOpacity Layout.fillWidth: true Layout.alignment: Qt.AlignHCenter - anchors.bottomMargin: 3 * scaleRatio + anchors.bottomMargin: 3 } MoneroComponents.Label { id: soloTitleLabel2 - fontSize: 24 * scaleRatio + fontSize: 24 text: qsTr("Check Transaction") + translationManager.emptyString } @@ -142,17 +142,17 @@ Rectangle { wrapMode: Text.Wrap Layout.fillWidth: true font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 color: MoneroComponents.Style.defaultFontColor } MoneroComponents.LineEdit { id: checkProofTxIdLine Layout.fillWidth: true - labelFontSize: 14 * scaleRatio + labelFontSize: 14 labelText: qsTr("Transaction ID") + translationManager.emptyString - fontSize: 16 * scaleRatio - placeholderFontSize: 16 * scaleRatio + fontSize: 16 + placeholderFontSize: 16 placeholderText: qsTr("Paste tx ID") + translationManager.emptyString readOnly: false copyButton: true @@ -161,10 +161,10 @@ Rectangle { MoneroComponents.LineEdit { id: checkProofAddressLine Layout.fillWidth: true - labelFontSize: 14 * scaleRatio + labelFontSize: 14 labelText: qsTr("Address") + translationManager.emptyString - fontSize: 16 * scaleRatio - placeholderFontSize: 16 * scaleRatio + fontSize: 16 + placeholderFontSize: 16 placeholderText: qsTr("Recipient's wallet address") + translationManager.emptyString; readOnly: false copyButton: true @@ -173,10 +173,10 @@ Rectangle { MoneroComponents.LineEdit { id: checkProofMessageLine Layout.fillWidth: true - fontSize: 16 * scaleRatio - labelFontSize: 14 * scaleRatio + fontSize: 16 + labelFontSize: 14 labelText: qsTr("Message") + translationManager.emptyString - placeholderFontSize: 16 * scaleRatio + placeholderFontSize: 16 placeholderText: qsTr("Optional message against which the signature is signed") + translationManager.emptyString; readOnly: false copyButton: true @@ -185,17 +185,17 @@ Rectangle { MoneroComponents.LineEdit { id: checkProofSignatureLine Layout.fillWidth: true - fontSize: 16 * scaleRatio - labelFontSize: 14 * scaleRatio + fontSize: 16 + labelFontSize: 14 labelText: qsTr("Signature") + translationManager.emptyString - placeholderFontSize: 16 * scaleRatio + placeholderFontSize: 16 placeholderText: qsTr("Paste tx proof") + translationManager.emptyString; readOnly: false copyButton: true } MoneroComponents.StandardButton { - Layout.topMargin: 16 * scaleRatio + Layout.topMargin: 16 small: true text: qsTr("Check") + translationManager.emptyString enabled: TxUtils.checkTxID(checkProofTxIdLine.text) && TxUtils.checkSignature(checkProofSignatureLine.text) && ((checkProofSignatureLine.text.indexOf("SpendProofV") === 0 && checkProofAddressLine.text.length == 0) || (checkProofSignatureLine.text.indexOf("SpendProofV") !== 0 && TxUtils.checkAddress(checkProofAddressLine.text, appWindow.persistentSettings.nettype))) @@ -212,7 +212,7 @@ Rectangle { opacity: MoneroComponents.Style.dividerOpacity Layout.fillWidth: true Layout.alignment: Qt.AlignHCenter - anchors.bottomMargin: 3 * scaleRatio + anchors.bottomMargin: 3 } MoneroComponents.TextPlain { @@ -220,7 +220,7 @@ Rectangle { wrapMode: Text.Wrap Layout.fillWidth: true font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 color: MoneroComponents.Style.defaultFontColor } } diff --git a/pages/merchant/Merchant.qml b/pages/merchant/Merchant.qml index e748a65c..0f0630aa 100644 --- a/pages/merchant/Merchant.qml +++ b/pages/merchant/Merchant.qml @@ -24,8 +24,8 @@ Item { id: root anchors.margins: 0 - property int minWidth: 900 * scaleRatio - property int qrCodeSize: 220 * scaleRatio + property int minWidth: 900 + property int qrCodeSize: 220 property bool enableTracking: false property string trackingError: "" // setting this will show a message @ tracking table property alias merchantHeight: mainLayout.height @@ -64,7 +64,7 @@ Item { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right - height: 300 * scaleRatio + height: 300 source: "qrc:///images/merchant/bg.png" smooth: false } @@ -75,8 +75,8 @@ Item { spacing: 0 // emulates max-width + center for container - property int maxWidth: 1200 * scaleRatio - property int defaultMargin: 50 * scaleRatio + property int maxWidth: 1200 + property int defaultMargin: 50 property int horizontalMargin: { if(appWindow.width >= maxWidth){ return ((appWindow.width - maxWidth) / 2) + defaultMargin; @@ -93,7 +93,7 @@ Item { anchors.right: parent.right Item { - height: 220 * scaleRatio + height: 220 anchors.left: parent.left anchors.right: parent.right @@ -101,8 +101,8 @@ Item { id: tracker anchors.left: parent.left anchors.top: parent.top - height: 220 * scaleRatio - width: (parent.width - qrImg.width) - 50 * scaleRatio + height: 220 + width: (parent.width - qrImg.width) - 50 radius: 5 ColumnLayout { @@ -113,21 +113,21 @@ Item { RowLayout { spacing: 0 - height: 56 * scaleRatio + height: 56 RowLayout { Layout.alignment: Qt.AlignLeft - Layout.preferredWidth: 260 * scaleRatio + Layout.preferredWidth: 260 Layout.preferredHeight: parent.height Layout.fillHeight: true - spacing: 8 * scaleRatio + spacing: 8 Item { - Layout.preferredWidth: 10 * scaleRatio + Layout.preferredWidth: 10 } MoneroComponents.TextPlain { - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 font.bold: true color: "#767676" text: qsTr("Sales") + translationManager.emptyString @@ -146,13 +146,13 @@ Item { Rectangle { Layout.fillWidth: true - Layout.preferredHeight: 1 * scaleRatio + Layout.preferredHeight: 1 color: "#d9d9d9" } MerchantTrackingList { Layout.fillWidth: true - Layout.preferredHeight: 400 * scaleRatio + Layout.preferredHeight: 400 model: trackingModel message: { if(!root.enableTracking){ @@ -212,7 +212,7 @@ Item { Image { id: qrCode anchors.fill: parent - anchors.margins: 1 * scaleRatio + anchors.margins: 1 smooth: false fillMode: Image.PreserveAspectFit @@ -257,18 +257,18 @@ Item { } Item { - Layout.preferredHeight: 40 * scaleRatio + Layout.preferredHeight: 40 anchors.left: parent.left anchors.right: parent.right Item { - width: (parent.width - qrImg.width) - (50 * scaleRatio) - height: 32 * scaleRatio + width: (parent.width - qrImg.width) - (50) + height: 32 MoneroComponents.TextPlain { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - font.pixelSize: 12 * scaleRatio + font.pixelSize: 12 font.bold: false color: "white" text: "<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 12px;}</style>Currently selected address: " + addressLabel + " <a href='#'>(Change)</a>" @@ -287,13 +287,13 @@ Item { Item { anchors.right: parent.right anchors.top: parent.top - width: 220 * scaleRatio - height: 32 * scaleRatio + width: 220 + height: 32 MoneroComponents.TextPlain { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - font.pixelSize: 12 * scaleRatio + font.pixelSize: 12 font.bold: false color: "white" text: qsTr("(right-click, save as)") + translationManager.emptyString @@ -303,16 +303,16 @@ Item { } Item { - Layout.preferredHeight: 120 * scaleRatio - Layout.topMargin: 20 * scaleRatio + Layout.preferredHeight: 120 + Layout.topMargin: 20 Layout.fillWidth: true Rectangle { id: payment_url_container anchors.left: parent.left anchors.top: parent.top - implicitHeight: 120 * scaleRatio - width: (parent.width - qrImg.width) - (50 * scaleRatio) + implicitHeight: 120 + width: (parent.width - qrImg.width) - (50) radius: 5 ColumnLayout { @@ -323,21 +323,21 @@ Item { RowLayout { spacing: 0 - height: 56 * scaleRatio + height: 56 RowLayout { Layout.alignment: Qt.AlignLeft - Layout.preferredWidth: 260 * scaleRatio + Layout.preferredWidth: 260 Layout.preferredHeight: parent.height Layout.fillHeight: true spacing: 8 Item { - Layout.preferredWidth: 10 * scaleRatio + Layout.preferredWidth: 10 } MoneroComponents.TextPlain { - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 font.bold: true color: "#767676" text: qsTr("Payment URL") + translationManager.emptyString @@ -353,15 +353,15 @@ Item { // Rectangle { // // help box // Layout.alignment: Qt.AlignLeft -// Layout.preferredWidth: 40 * scaleRatio +// Layout.preferredWidth: 40 // Layout.fillHeight: true // color: "transparent" // MoneroComponents.TextPlain { // anchors.verticalCenter: parent.verticalCenter // anchors.right: parent.right -// anchors.rightMargin: 20 * scaleRatio -// font.pixelSize: 16 * scaleRatio +// anchors.rightMargin: 20 +// font.pixelSize: 16 // font.bold: true // color: "#767676" // text:"?" @@ -394,13 +394,13 @@ Item { MoneroComponents.TextPlain { property string _color: "#767676" Layout.fillWidth: true - Layout.margins: 20 * scaleRatio - Layout.topMargin: 10 * scaleRatio + Layout.margins: 20 + Layout.topMargin: 10 wrapMode: Text.WrapAnywhere elide: Text.ElideRight - font.pixelSize: 12 * scaleRatio + font.pixelSize: 12 font.bold: true color: _color text: TxUtils.makeQRCodeString(appWindow.current_address, amountToReceive.text) @@ -441,15 +441,15 @@ Item { Item { anchors.right: parent.right anchors.top: parent.top - width: 220 * scaleRatio - height: 32 * scaleRatio + width: 220 + height: 32 ColumnLayout { anchors.left: parent.left anchors.right: parent.right MoneroComponents.TextPlain { - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 font.bold: false color: "white" text: qsTr("Amount to receive") + " (XMR)" @@ -457,20 +457,20 @@ Item { } Image { - height: 28 * scaleRatio - width: 220 * scaleRatio + height: 28 + width: 220 source: "qrc:///images/merchant/input_box.png" TextField { id: amountToReceive topPadding: 0 - leftPadding: 10 * scaleRatio + leftPadding: 10 anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - anchors.topMargin: 3 * scaleRatio - font.pixelSize: 16 * scaleRatio + anchors.topMargin: 3 + font.pixelSize: 16 font.bold: true horizontalAlignment: TextInput.AlignLeft verticalAlignment: TextInput.AlignVCenter @@ -495,14 +495,14 @@ Item { } Item { - height: 2 * scaleRatio - width: 220 * scaleRatio + height: 2 + width: 220 } MoneroComponents.TextPlain { // @TODO: When we have XMR/USD rate avi. in the future. visible: false - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 font.bold: false color: "white" text: qsTr("Amount to receive") + " (USD)" @@ -512,8 +512,8 @@ Item { Image { visible: false - height: 28 * scaleRatio - width: 220 * scaleRatio + height: 28 + width: 220 source: "qrc:///images/merchant/input_box.png" opacity: 0.2 } @@ -522,13 +522,13 @@ Item { } Item { - Layout.topMargin: 32 * scaleRatio - Layout.preferredHeight: 40 * scaleRatio + Layout.topMargin: 32 + Layout.preferredHeight: 40 anchors.left: parent.left anchors.right: parent.right ColumnLayout { - spacing: 16 * scaleRatio + spacing: 16 MerchantCheckbox { id: trackingCheckbox @@ -542,7 +542,7 @@ Item { MoneroComponents.TextPlain { id: content - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 font.bold: false color: "white" text: qsTr("Leave this page") + translationManager.emptyString @@ -563,16 +563,16 @@ Item { // Shows when the window is too small visible: parent.width < root.minWidth anchors.top: parent.top - anchors.topMargin: 100 * scaleRatio; + anchors.topMargin: 100; anchors.horizontalCenter: parent.horizontalCenter - height: 120 * scaleRatio - width: 400 * scaleRatio + height: 120 + width: 400 radius: 5 MoneroComponents.TextPlain { anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 font.bold: true color: MoneroComponents.Style.moneroGrey text: qsTr("The merchant page requires a larger window") + translationManager.emptyString diff --git a/pages/merchant/MerchantCheckbox.qml b/pages/merchant/MerchantCheckbox.qml index 7e498dfa..81eb924d 100644 --- a/pages/merchant/MerchantCheckbox.qml +++ b/pages/merchant/MerchantCheckbox.qml @@ -6,7 +6,7 @@ import "../../components" as MoneroComponents RowLayout { id: root - spacing: 10 * scaleRatio + spacing: 10 property bool checked: false; property alias text: content.text signal changed; @@ -15,8 +15,8 @@ RowLayout { id: checkbox anchors.left: parent.left anchors.top: parent.top - implicitHeight: 22 * scaleRatio - width: 22 * scaleRatio + implicitHeight: 22 + width: 22 radius: 5 Image { @@ -29,7 +29,7 @@ RowLayout { MoneroComponents.TextPlain { id: content - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 font.bold: false color: "white" text: "" diff --git a/pages/merchant/MerchantTitlebar.qml b/pages/merchant/MerchantTitlebar.qml index b16a4341..4a6b0472 100644 --- a/pages/merchant/MerchantTitlebar.qml +++ b/pages/merchant/MerchantTitlebar.qml @@ -45,7 +45,7 @@ Rectangle { height: { if(!persistentSettings.customDecorations || isMobile) return 0; - return 50 * scaleRatio; + return 50; } z: 1 diff --git a/pages/merchant/MerchantTrackingList.qml b/pages/merchant/MerchantTrackingList.qml index 04268237..4c80b641 100644 --- a/pages/merchant/MerchantTrackingList.qml +++ b/pages/merchant/MerchantTrackingList.qml @@ -28,11 +28,11 @@ ListView { // message box visible: parent.message !== "" anchors.fill: parent - anchors.margins: 20 * scaleRatio - anchors.topMargin: 10 * scaleRatio + anchors.margins: 20 + anchors.topMargin: 10 wrapMode: Text.Wrap - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 font.bold: false color: "#767676" textFormat: Text.RichText @@ -46,7 +46,7 @@ ListView { delegate: Item { id: trackingTableItem visible: trackingListView.message === "" - height: 53 * scaleRatio + height: 53 width: parent.width Layout.fillWidth: true @@ -58,22 +58,22 @@ ListView { Item { Layout.preferredHeight: parent.height - Layout.preferredWidth: 20 * scaleRatio + Layout.preferredWidth: 20 } ColumnLayout { spacing: 0 - Layout.preferredHeight: 40 * scaleRatio - Layout.preferredWidth: 240 * scaleRatio + Layout.preferredHeight: 40 + Layout.preferredWidth: 240 Item { Layout.preferredWidth: parent.width - Layout.preferredHeight: 18 * scaleRatio + Layout.preferredHeight: 18 TextEdit { id: dateString anchors.verticalCenter: parent.verticalCenter - font.pixelSize: 13 * scaleRatio + font.pixelSize: 13 font.bold: false color: "#707070" text: time_date + " (" + Utils.ago(time_epoch) + ") " @@ -93,11 +93,11 @@ ListView { TextEdit { id: hideAmount anchors.top: parent.top - anchors.topMargin: 1 * scaleRatio + anchors.topMargin: 1 anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter readOnly: true - font.pixelSize: 12 * scaleRatio + font.pixelSize: 12 font.bold: false color: "#707070" text: (hide_amount ? "(" + qsTr("show") + ")" : "(" + qsTr("hide") + ")") + translationManager.emptyString @@ -117,12 +117,12 @@ ListView { Item { Layout.preferredWidth: parent.width - Layout.preferredHeight: 18 * scaleRatio + Layout.preferredHeight: 18 TextEdit { id: amountText anchors.verticalCenter: parent.verticalCenter - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 font.bold: true color: hide_amount ? "#707070" : "#009F1E" text: hide_amount ? '-' : '+' + amount @@ -141,7 +141,7 @@ ListView { RowLayout { spacing: 0 Layout.preferredHeight: parent.height - Layout.preferredWidth: 240 * scaleRatio + Layout.preferredWidth: 240 Item { Layout.fillWidth: true @@ -149,13 +149,13 @@ ListView { } Item { - Layout.preferredWidth: 150 * scaleRatio + Layout.preferredWidth: 150 Layout.preferredHeight: parent.height TextEdit { anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter - font.pixelSize: 12 * scaleRatio + font.pixelSize: 12 font.bold: false color: "#a8a8a8" text: { @@ -191,14 +191,14 @@ ListView { } Item { - Layout.preferredWidth: 30 * scaleRatio + Layout.preferredWidth: 30 Layout.preferredHeight: parent.height Image { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - Layout.preferredWidth: 12 * scaleRatio - Layout.preferredHeight: 21 * scaleRatio + Layout.preferredWidth: 12 + Layout.preferredHeight: 21 source: "qrc:///images/merchant/arrow_right.png" } @@ -214,7 +214,7 @@ ListView { } Item { - Layout.preferredWidth: 10 * scaleRatio + Layout.preferredWidth: 10 Layout.preferredHeight: parent.height } } diff --git a/pages/settings/Navbar.qml b/pages/settings/Navbar.qml index b582c132..eb299c1f 100644 --- a/pages/settings/Navbar.qml +++ b/pages/settings/Navbar.qml @@ -55,7 +55,7 @@ Rectangle { columnSpacing: 0 property string fontColorActive: MoneroComponents.Style.blackTheme ? "white" : "white" property string fontColorInActive: MoneroComponents.Style.blackTheme ? "white" : MoneroComponents.Style.dimmedFontColor - property int fontSize: 15 * scaleRatio + property int fontSize: 15 property bool fontBold: true property var fontFamily: MoneroComponents.Style.fontRegular.name property string borderColor: MoneroComponents.Style.blackTheme ? "#808080" : "#B9B9B9" @@ -118,7 +118,7 @@ Rectangle { id: navWallet property bool isActive: settingsStateView.state === "Wallet" Layout.preferredWidth: navWalletText.width + grid.textMargin - Layout.minimumWidth: 72 * scaleRatio + Layout.minimumWidth: 72 Layout.preferredHeight: 32 spacing: 0 @@ -130,7 +130,7 @@ Rectangle { Rectangle { color: parent.isActive ? grid.borderColor : "transparent" - height: 30 * scaleRatio + height: 30 Layout.fillWidth: true MoneroComponents.TextPlain { @@ -171,7 +171,7 @@ Rectangle { property bool isActive: settingsStateView.state === "UI" Layout.preferredWidth: navUIText.width + grid.textMargin Layout.preferredHeight: 32 - Layout.minimumWidth: 72 * scaleRatio + Layout.minimumWidth: 72 spacing: 0 Rectangle { @@ -182,7 +182,7 @@ Rectangle { Rectangle { color: parent.isActive ? grid.borderColor : "transparent" - height: 30 * scaleRatio + height: 30 Layout.fillWidth: true MoneroComponents.TextPlain { @@ -224,7 +224,7 @@ Rectangle { visible: appWindow.walletMode >= 2 Layout.preferredWidth: navNodeText.width + grid.textMargin Layout.preferredHeight: 32 - Layout.minimumWidth: 72 * scaleRatio + Layout.minimumWidth: 72 spacing: 0 Rectangle { @@ -235,7 +235,7 @@ Rectangle { Rectangle { color: parent.isActive ? grid.borderColor : "transparent" - height: 30 * scaleRatio + height: 30 Layout.fillWidth: true MoneroComponents.TextPlain { @@ -278,7 +278,7 @@ Rectangle { visible: appWindow.walletMode >= 2 Layout.preferredWidth: navLogText.width + grid.textMargin Layout.preferredHeight: 32 - Layout.minimumWidth: 72 * scaleRatio + Layout.minimumWidth: 72 spacing: 0 Rectangle { @@ -289,7 +289,7 @@ Rectangle { Rectangle { color: parent.isActive ? grid.borderColor : "transparent" - height: 30 * scaleRatio + height: 30 Layout.fillWidth: true MoneroComponents.TextPlain { @@ -331,7 +331,7 @@ Rectangle { property bool isActive: settingsStateView.state === "Info" Layout.preferredWidth: navInfoText.width + grid.textMargin Layout.preferredHeight: 32 - Layout.minimumWidth: 72 * scaleRatio + Layout.minimumWidth: 72 spacing: 0 Rectangle { @@ -342,7 +342,7 @@ Rectangle { Rectangle { color: parent.isActive ? grid.borderColor : "transparent" - height: 30 * scaleRatio + height: 30 Layout.fillWidth: true MoneroComponents.TextPlain { diff --git a/pages/settings/SettingsInfo.qml b/pages/settings/SettingsInfo.qml index 207e56cc..9da336bf 100644 --- a/pages/settings/SettingsInfo.qml +++ b/pages/settings/SettingsInfo.qml @@ -38,7 +38,7 @@ import "../../components" as MoneroComponents Rectangle { color: "transparent" - height: 1400 * scaleRatio + height: 1400 Layout.fillWidth: true property string walletModeString: { if(appWindow.walletMode === 0){ @@ -56,29 +56,29 @@ Rectangle { anchors.left: parent.left anchors.top: parent.top anchors.right: parent.right - anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio + anchors.margins: (isMobile)? 17 : 20 anchors.topMargin: 0 - spacing: 30 * scaleRatio + spacing: 30 GridLayout { columns: 2 columnSpacing: 0 MoneroComponents.TextBlock { - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 text: qsTr("GUI version: ") + translationManager.emptyString } MoneroComponents.TextBlock { - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 color: MoneroComponents.Style.dimmedFontColor text: Version.GUI_VERSION + " (Qt " + qtRuntimeVersion + ")" + translationManager.emptyString } Rectangle { height: 1 - Layout.topMargin: 2 * scaleRatio - Layout.bottomMargin: 2 * scaleRatio + Layout.topMargin: 2 + Layout.bottomMargin: 2 Layout.fillWidth: true color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity @@ -86,8 +86,8 @@ Rectangle { Rectangle { height: 1 - Layout.topMargin: 2 * scaleRatio - Layout.bottomMargin: 2 * scaleRatio + Layout.topMargin: 2 + Layout.bottomMargin: 2 Layout.fillWidth: true color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity @@ -95,20 +95,20 @@ Rectangle { MoneroComponents.TextBlock { id: guiMoneroVersion - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 text: qsTr("Embedded Monero version: ") + translationManager.emptyString } MoneroComponents.TextBlock { - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 color: MoneroComponents.Style.dimmedFontColor text: Version.GUI_MONERO_VERSION + translationManager.emptyString } Rectangle { height: 1 - Layout.topMargin: 2 * scaleRatio - Layout.bottomMargin: 2 * scaleRatio + Layout.topMargin: 2 + Layout.bottomMargin: 2 Layout.fillWidth: true color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity @@ -116,8 +116,8 @@ Rectangle { Rectangle { height: 1 - Layout.topMargin: 2 * scaleRatio - Layout.bottomMargin: 2 * scaleRatio + Layout.topMargin: 2 + Layout.bottomMargin: 2 Layout.fillWidth: true color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity @@ -125,15 +125,15 @@ Rectangle { MoneroComponents.TextBlock { Layout.fillWidth: true - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 text: qsTr("Wallet path: ") + translationManager.emptyString } MoneroComponents.TextBlock { Layout.fillWidth: true - Layout.maximumWidth: 360 * scaleRatio + Layout.maximumWidth: 360 color: MoneroComponents.Style.dimmedFontColor - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 text: { var wallet_path = walletPath(); if(isIOS) @@ -144,8 +144,8 @@ Rectangle { Rectangle { height: 1 - Layout.topMargin: 2 * scaleRatio - Layout.bottomMargin: 2 * scaleRatio + Layout.topMargin: 2 + Layout.bottomMargin: 2 Layout.fillWidth: true color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity @@ -153,8 +153,8 @@ Rectangle { Rectangle { height: 1 - Layout.topMargin: 2 * scaleRatio - Layout.bottomMargin: 2 * scaleRatio + Layout.topMargin: 2 + Layout.bottomMargin: 2 Layout.fillWidth: true color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity @@ -162,7 +162,7 @@ Rectangle { MoneroComponents.TextBlock { id: restoreHeight - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 textFormat: Text.RichText text: (typeof currentWallet == "undefined") ? "" : qsTr("Wallet creation height: ") + translationManager.emptyString } @@ -172,7 +172,7 @@ Rectangle { Layout.fillWidth: true textFormat: Text.RichText color: MoneroComponents.Style.dimmedFontColor - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 property var style: "<style type='text/css'>a {cursor:pointer;text-decoration: none; color: #FF6C3C}</style>" text: (currentWallet ? currentWallet.walletCreationHeight : "") + style + qsTr(" <a href='#'> (Click to change)</a>") + translationManager.emptyString onLinkActivated: { @@ -234,8 +234,8 @@ Rectangle { Rectangle { height: 1 - Layout.topMargin: 2 * scaleRatio - Layout.bottomMargin: 2 * scaleRatio + Layout.topMargin: 2 + Layout.bottomMargin: 2 Layout.fillWidth: true color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity @@ -243,8 +243,8 @@ Rectangle { Rectangle { height: 1 - Layout.topMargin: 2 * scaleRatio - Layout.bottomMargin: 2 * scaleRatio + Layout.topMargin: 2 + Layout.bottomMargin: 2 Layout.fillWidth: true color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity @@ -252,21 +252,21 @@ Rectangle { MoneroComponents.TextBlock { Layout.fillWidth: true - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 text: qsTr("Wallet log path: ") + translationManager.emptyString } MoneroComponents.TextBlock { Layout.fillWidth: true color: MoneroComponents.Style.dimmedFontColor - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 text: walletLogPath } Rectangle { height: 1 - Layout.topMargin: 2 * scaleRatio - Layout.bottomMargin: 2 * scaleRatio + Layout.topMargin: 2 + Layout.bottomMargin: 2 Layout.fillWidth: true color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity @@ -274,8 +274,8 @@ Rectangle { Rectangle { height: 1 - Layout.topMargin: 2 * scaleRatio - Layout.bottomMargin: 2 * scaleRatio + Layout.topMargin: 2 + Layout.bottomMargin: 2 Layout.fillWidth: true color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity @@ -283,21 +283,21 @@ Rectangle { MoneroComponents.TextBlock { Layout.fillWidth: true - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 text: qsTr("Wallet mode: ") + translationManager.emptyString } MoneroComponents.TextBlock { Layout.fillWidth: true color: MoneroComponents.Style.dimmedFontColor - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 text: walletModeString } Rectangle { height: 1 - Layout.topMargin: 2 * scaleRatio - Layout.bottomMargin: 2 * scaleRatio + Layout.topMargin: 2 + Layout.bottomMargin: 2 Layout.fillWidth: true color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity @@ -305,8 +305,8 @@ Rectangle { Rectangle { height: 1 - Layout.topMargin: 2 * scaleRatio - Layout.bottomMargin: 2 * scaleRatio + Layout.topMargin: 2 + Layout.bottomMargin: 2 Layout.fillWidth: true color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity @@ -314,14 +314,14 @@ Rectangle { MoneroComponents.TextBlock { Layout.fillWidth: true - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 text: qsTr("Graphics mode: ") + translationManager.emptyString } MoneroComponents.TextBlock { Layout.fillWidth: true color: MoneroComponents.Style.dimmedFontColor - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 text: isOpenGL ? "OpenGL" : "Low graphics mode" } } diff --git a/pages/settings/SettingsLayout.qml b/pages/settings/SettingsLayout.qml index 7d6babc8..b0165915 100644 --- a/pages/settings/SettingsLayout.qml +++ b/pages/settings/SettingsLayout.qml @@ -50,14 +50,14 @@ Rectangle { ColumnLayout { id: settingsUI - property int itemHeight: 60 * scaleRatio + property int itemHeight: 60 Layout.fillWidth: true anchors.left: parent.left anchors.top: parent.top anchors.right: parent.right - anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio + anchors.margins: (isMobile)? 17 : 20 anchors.topMargin: 0 - spacing: 6 * scaleRatio + spacing: 6 MoneroComponents.CheckBox { visible: !isMobile @@ -109,12 +109,12 @@ Rectangle { ColumnLayout { visible: userInActivityCheckbox.checked Layout.fillWidth: true - Layout.topMargin: 6 * scaleRatio - Layout.leftMargin: 42 * scaleRatio + Layout.topMargin: 6 + Layout.leftMargin: 42 spacing: 0 MoneroComponents.TextBlock { - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 Layout.fillWidth: true text: { var val = userInactivitySlider.value; @@ -136,8 +136,8 @@ Rectangle { background: Rectangle { x: parent.leftPadding y: parent.topPadding + parent.availableHeight / 2 - height / 2 - implicitWidth: 200 * scaleRatio - implicitHeight: 4 * scaleRatio + implicitWidth: 200 + implicitHeight: 4 width: parent.availableWidth height: implicitHeight radius: 2 @@ -154,8 +154,8 @@ Rectangle { handle: Rectangle { x: parent.leftPadding + parent.visualPosition * (parent.availableWidth - width) y: parent.topPadding + parent.availableHeight / 2 - height / 2 - implicitWidth: 18 * scaleRatio - implicitHeight: 18 * scaleRatio + implicitWidth: 18 + implicitHeight: 18 radius: 8 color: parent.pressed ? "#f0f0f0" : "#f6f6f6" border.color: MoneroComponents.Style.grey @@ -167,7 +167,7 @@ Rectangle { MoneroComponents.StandardButton { visible: !persistentSettings.customDecorations - Layout.topMargin: 10 * scaleRatio + Layout.topMargin: 10 small: true text: qsTr("Change language") + translationManager.emptyString diff --git a/pages/settings/SettingsLog.qml b/pages/settings/SettingsLog.qml index b9d35865..1aa564d7 100644 --- a/pages/settings/SettingsLog.qml +++ b/pages/settings/SettingsLog.qml @@ -42,34 +42,34 @@ Rectangle { ColumnLayout { id: settingsLog - property int itemHeight: 60 * scaleRatio + property int itemHeight: 60 Layout.fillWidth: true anchors.left: parent.left anchors.top: parent.top anchors.right: parent.right - anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio + anchors.margins: (isMobile)? 17 : 20 anchors.topMargin: 0 spacing: 10 // Rectangle { // // divider -// Layout.preferredHeight: 1 * scaleRatio +// Layout.preferredHeight: 1 // Layout.fillWidth: true -// Layout.bottomMargin: 8 * scaleRatio +// Layout.bottomMargin: 8 // color: MoneroComponents.Style.dividerColor // opacity: MoneroComponents.Style.dividerOpacity // } MoneroComponents.TextPlain { - Layout.bottomMargin: 2 * scaleRatio + Layout.bottomMargin: 2 color: MoneroComponents.Style.defaultFontColor - font.pixelSize: 18 * scaleRatio + font.pixelSize: 18 font.family: MoneroComponents.Style.fontRegular.name text: qsTr("Log level") + translationManager.emptyString } ColumnLayout { - spacing: 10 * scaleRatio + spacing: 10 Layout.fillWidth: true id: logColumn z: parent.z + 1 @@ -87,7 +87,7 @@ Rectangle { MoneroComponents.StandardDropdown { id: logLevelDropdown dataModel: logLevel - itemTopMargin: 2 * scaleRatio + itemTopMargin: 2 currentIndex: appWindow.persistentSettings.logLevel; onChanged: { if (currentIndex == 5) { @@ -112,8 +112,8 @@ Rectangle { Layout.preferredWidth: logColumn.width text: appWindow.persistentSettings.logCategories placeholderText: "(e.g. *:WARNING,net.p2p:DEBUG)" - placeholderFontSize: 14 * scaleRatio - fontSize: 14 * scaleRatio + placeholderFontSize: 14 + fontSize: 14 enabled: logLevelDropdown.currentIndex === 5 onEditingFinished: { if(enabled) { @@ -126,10 +126,10 @@ Rectangle { } MoneroComponents.TextPlain { - Layout.topMargin: 10 * scaleRatio - Layout.bottomMargin: 2 * scaleRatio + Layout.topMargin: 10 + Layout.bottomMargin: 2 color: MoneroComponents.Style.defaultFontColor - font.pixelSize: 18 * scaleRatio + font.pixelSize: 18 font.family: MoneroComponents.Style.fontRegular.name text: qsTr("Daemon log") + translationManager.emptyString } @@ -137,7 +137,7 @@ Rectangle { Item { Layout.fillHeight: true Layout.fillWidth: true - Layout.preferredHeight: 240 * scaleRatio + Layout.preferredHeight: 240 Rectangle { anchors.fill: parent @@ -159,7 +159,7 @@ Rectangle { selectByMouse: true selectByKeyboard: true font.family: MoneroComponents.Style.defaultFontColor - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 wrapMode: TextEdit.Wrap readOnly: true function logCommand(msg){ @@ -212,7 +212,7 @@ Rectangle { Layout.fillWidth: true fontBold: false placeholderText: qsTr("command + enter (e.g 'help' or 'status')") + translationManager.emptyString - placeholderFontSize: 16 * scaleRatio + placeholderFontSize: 16 onAccepted: { if(text.length > 0) { consoleArea.logCommand(">>> " + text) diff --git a/pages/settings/SettingsNode.qml b/pages/settings/SettingsNode.qml index 8159ea87..3df51c4c 100644 --- a/pages/settings/SettingsNode.qml +++ b/pages/settings/SettingsNode.qml @@ -42,17 +42,17 @@ Rectangle{ /* main layout */ ColumnLayout { id: root - anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio + anchors.margins: (isMobile)? 17 : 20 anchors.topMargin: 0 anchors.left: parent.left anchors.top: parent.top anchors.right: parent.right - spacing: 0 * scaleRatio + spacing: 0 property int labelWidth: 120 property int editWidth: 400 - property int lineEditFontSize: 14 * scaleRatio + property int lineEditFontSize: 14 property int buttonWidth: 110 Rectangle { @@ -63,7 +63,7 @@ Rectangle{ Rectangle { id: localNodeDivider Layout.fillWidth: true - anchors.topMargin: 0 * scaleRatio + anchors.topMargin: 0 anchors.left: parent.left anchors.right: parent.right height: 1 @@ -93,7 +93,7 @@ Rectangle{ height: 32 width: 32 anchors.left: parent.left - anchors.leftMargin: 16 * scaleRatio + anchors.leftMargin: 16 anchors.verticalCenter: parent.verticalCenter MoneroEffects.ImageMask { @@ -113,25 +113,25 @@ Rectangle{ MoneroComponents.TextPlain { id: localNodeHeader anchors.left: localNodeIcon.right - anchors.leftMargin: 14 * scaleRatio + anchors.leftMargin: 14 anchors.top: parent.top color: MoneroComponents.Style.defaultFontColor opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8 font.bold: true font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 text: qsTr("Local node") + translationManager.emptyString } TextArea { id: localNodeArea anchors.top: localNodeHeader.bottom - anchors.topMargin: 4 * scaleRatio + anchors.topMargin: 4 anchors.left: localNodeIcon.right - anchors.leftMargin: 14 * scaleRatio + anchors.leftMargin: 14 color: MoneroComponents.Style.dimmedFontColor font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 horizontalAlignment: TextInput.AlignLeft selectByMouse: false wrapMode: Text.WordWrap; @@ -169,7 +169,7 @@ Rectangle{ Rectangle { id: remoteNodeDivider Layout.fillWidth: true - anchors.topMargin: 0 * scaleRatio + anchors.topMargin: 0 anchors.left: parent.left anchors.right: parent.right height: 1 @@ -199,7 +199,7 @@ Rectangle{ height: 32 width: 32 anchors.left: parent.left - anchors.leftMargin: 16 * scaleRatio + anchors.leftMargin: 16 anchors.verticalCenter: parent.verticalCenter MoneroEffects.ImageMask { @@ -218,25 +218,25 @@ Rectangle{ MoneroComponents.TextPlain { id: remoteNodeHeader anchors.left: remoteNodeIcon.right - anchors.leftMargin: 14 * scaleRatio + anchors.leftMargin: 14 anchors.top: parent.top color: MoneroComponents.Style.defaultFontColor opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8 font.bold: true font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 text: qsTr("Remote node") + translationManager.emptyString } TextArea { id: remoteNodeArea anchors.top: remoteNodeHeader.bottom - anchors.topMargin: 4 * scaleRatio + anchors.topMargin: 4 anchors.left: remoteNodeIcon.right - anchors.leftMargin: 14 * scaleRatio + anchors.leftMargin: 14 color: MoneroComponents.Style.dimmedFontColor font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 15 * scaleRatio + font.pixelSize: 15 activeFocusOnPress: false horizontalAlignment: TextInput.AlignLeft selectByMouse: false @@ -269,7 +269,7 @@ Rectangle{ Rectangle { id: localNodeBottomDivider Layout.fillWidth: true - anchors.topMargin: 0 * scaleRatio + anchors.topMargin: 0 anchors.left: parent.left anchors.right: parent.right anchors.bottom: parent.bottom @@ -282,21 +282,21 @@ Rectangle{ ColumnLayout { id: remoteNodeLayout anchors.margins: 0 - spacing: 20 * scaleRatio + spacing: 20 Layout.fillWidth: true Layout.topMargin: 20 visible: !isMobile && persistentSettings.useRemoteNode MoneroComponents.WarningBox { - Layout.topMargin: 26 * scaleRatio - Layout.bottomMargin: 6 * scaleRatio + Layout.topMargin: 26 + Layout.bottomMargin: 6 text: qsTr("To find a remote node, type 'Monero remote node' into your favorite search engine. Please ensure the node is run by a trusted third-party.") + translationManager.emptyString } MoneroComponents.RemoteNodeEdit { id: remoteNodeEdit - Layout.minimumWidth: 100 * scaleRatio - placeholderFontSize: 15 * scaleRatio + Layout.minimumWidth: 100 + placeholderFontSize: 15 daemonAddrLabelText: qsTr("Address") daemonPortLabelText: qsTr("Port") @@ -326,9 +326,9 @@ Rectangle{ labelText: "Daemon username" text: persistentSettings.daemonUsername placeholderText: qsTr("(optional)") + translationManager.emptyString - placeholderFontSize: 15 * scaleRatio - labelFontSize: 14 * scaleRatio - fontSize: 15 * scaleRatio + placeholderFontSize: 15 + labelFontSize: 14 + fontSize: 15 } MoneroComponents.LineEdit { @@ -338,9 +338,9 @@ Rectangle{ text: persistentSettings.daemonPassword placeholderText: qsTr("Password") + translationManager.emptyString echoMode: TextInput.Password - placeholderFontSize: 15 * scaleRatio - labelFontSize: 14 * scaleRatio - fontSize: 15 * scaleRatio + placeholderFontSize: 15 + labelFontSize: 14 + fontSize: 15 } } @@ -375,7 +375,7 @@ Rectangle{ ColumnLayout { id: localNodeLayout - spacing: 20 * scaleRatio + spacing: 20 Layout.topMargin: 40 visible: !isMobile && !persistentSettings.useRemoteNode @@ -397,12 +397,12 @@ Rectangle{ id: blockchainFolder Layout.preferredWidth: 200 Layout.fillWidth: true - fontSize: 15 * scaleRatio - labelFontSize: 14 * scaleRatio + fontSize: 15 + labelFontSize: 14 property string style: "<style type='text/css'>a {cursor:pointer;text-decoration: none; color: #FF6C3C}</style>" labelText: qsTr("Blockchain location") + style + qsTr(" <a href='#'> (change)</a>") + translationManager.emptyString placeholderText: qsTr("(default)") + translationManager.emptyString - placeholderFontSize: 15 * scaleRatio + placeholderFontSize: 15 text: { if(persistentSettings.blockchainDataDir.length > 0){ return persistentSettings.blockchainDataDir; @@ -423,12 +423,12 @@ Rectangle{ MoneroComponents.LineEditMulti { id: daemonFlags Layout.fillWidth: true - labelFontSize: 14 * scaleRatio - fontSize: 15 * scaleRatio + labelFontSize: 14 + fontSize: 15 wrapMode: Text.WrapAnywhere labelText: qsTr("Daemon startup flags") + translationManager.emptyString placeholderText: qsTr("(optional)") + translationManager.emptyString - placeholderFontSize: 15 * scaleRatio + placeholderFontSize: 15 text: persistentSettings.daemonFlags addressValidation: false onEditingFinished: persistentSettings.daemonFlags = daemonFlags.text; @@ -442,8 +442,8 @@ Rectangle{ MoneroComponents.RemoteNodeEdit { id: bootstrapNodeEdit - Layout.minimumWidth: 100 * scaleRatio - Layout.bottomMargin: 20 * scaleRatio + Layout.minimumWidth: 100 + Layout.bottomMargin: 20 daemonAddrLabelText: qsTr("Bootstrap Address") daemonPortLabelText: qsTr("Bootstrap Port") diff --git a/pages/settings/SettingsWallet.qml b/pages/settings/SettingsWallet.qml index 92482ef5..1b42ed83 100644 --- a/pages/settings/SettingsWallet.qml +++ b/pages/settings/SettingsWallet.qml @@ -41,20 +41,20 @@ Rectangle { ColumnLayout { id: settingsWallet - property int itemHeight: 60 * scaleRatio + property int itemHeight: 60 Layout.fillWidth: true anchors.left: parent.left anchors.top: parent.top anchors.right: parent.right - anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio + anchors.margins: (isMobile)? 17 : 20 anchors.topMargin: 0 spacing: 0 Rectangle { // divider - Layout.preferredHeight: 1 * scaleRatio + Layout.preferredHeight: 1 Layout.fillWidth: true - Layout.bottomMargin: 8 * scaleRatio + Layout.bottomMargin: 8 color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity } @@ -71,13 +71,13 @@ Rectangle { MoneroComponents.TextPlain { Layout.fillWidth: true - Layout.preferredHeight: 20 * scaleRatio - Layout.topMargin: 8 * scaleRatio + Layout.preferredHeight: 20 + Layout.topMargin: 8 color: MoneroComponents.Style.defaultFontColor opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8 font.bold: true font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 text: qsTr("Close this wallet") + translationManager.emptyString } @@ -101,16 +101,16 @@ Rectangle { middlePanel.receiveView.clearFields(); appWindow.showWizard(); } - width: 135 * scaleRatio + width: 135 } } Rectangle { // divider - Layout.preferredHeight: 1 * scaleRatio + Layout.preferredHeight: 1 Layout.fillWidth: true - Layout.topMargin: 8 * scaleRatio - Layout.bottomMargin: 8 * scaleRatio + Layout.topMargin: 8 + Layout.bottomMargin: 8 color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity } @@ -128,13 +128,13 @@ Rectangle { MoneroComponents.TextPlain { Layout.fillWidth: true - Layout.preferredHeight: 20 * scaleRatio - Layout.topMargin: 8 * scaleRatio + Layout.preferredHeight: 20 + Layout.topMargin: 8 color: MoneroComponents.Style.defaultFontColor opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8 font.bold: true font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 text: qsTr("Create a view-only wallet") + translationManager.emptyString } @@ -166,17 +166,17 @@ Rectangle { informationPopup.open() } } - width: 135 * scaleRatio + width: 135 } } Rectangle { // divider visible: !appWindow.viewOnly - Layout.preferredHeight: 1 * scaleRatio + Layout.preferredHeight: 1 Layout.fillWidth: true - Layout.topMargin: 8 * scaleRatio - Layout.bottomMargin: 8 * scaleRatio + Layout.topMargin: 8 + Layout.bottomMargin: 8 color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity } @@ -193,13 +193,13 @@ Rectangle { MoneroComponents.TextPlain { Layout.fillWidth: true - Layout.preferredHeight: 20 * scaleRatio - Layout.topMargin: 8 * scaleRatio + Layout.preferredHeight: 20 + Layout.topMargin: 8 color: MoneroComponents.Style.defaultFontColor opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8 font.bold: true font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 text: qsTr("Show seed & keys") + translationManager.emptyString } @@ -220,16 +220,16 @@ Rectangle { onClicked: { Utils.showSeedPage(); } - width: 135 * scaleRatio + width: 135 } } Rectangle { // divider - Layout.preferredHeight: 1 * scaleRatio + Layout.preferredHeight: 1 Layout.fillWidth: true - Layout.topMargin: 8 * scaleRatio - Layout.bottomMargin: 8 * scaleRatio + Layout.topMargin: 8 + Layout.bottomMargin: 8 color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity } @@ -247,13 +247,13 @@ Rectangle { MoneroComponents.TextPlain { Layout.fillWidth: true - Layout.preferredHeight: 20 * scaleRatio - Layout.topMargin: 8 * scaleRatio + Layout.preferredHeight: 20 + Layout.topMargin: 8 color: MoneroComponents.Style.defaultFontColor opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8 font.bold: true font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 text: qsTr("Rescan wallet balance") + translationManager.emptyString } @@ -287,16 +287,16 @@ Rectangle { informationPopup.open(); } } - width: 135 * scaleRatio + width: 135 } } Rectangle { // divider visible: appWindow.walletMode >= 2 - Layout.preferredHeight: 1 * scaleRatio + Layout.preferredHeight: 1 Layout.fillWidth: true - Layout.topMargin: 8 * scaleRatio - Layout.bottomMargin: 8 * scaleRatio + Layout.topMargin: 8 + Layout.bottomMargin: 8 color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity } @@ -313,13 +313,13 @@ Rectangle { MoneroComponents.TextPlain { Layout.fillWidth: true - Layout.preferredHeight: 20 * scaleRatio - Layout.topMargin: 8 * scaleRatio + Layout.preferredHeight: 20 + Layout.topMargin: 8 color: MoneroComponents.Style.defaultFontColor opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8 font.bold: true font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 text: qsTr("Change wallet password") + translationManager.emptyString } @@ -353,7 +353,7 @@ Rectangle { passwordDialog.onRejectedCallback = null; passwordDialog.open() } - width: 135 * scaleRatio + width: 135 } } } |
