diff options
| author | dsc <xmrdsc@protonmail.com> | 2019-04-25 21:09:23 +0200 |
|---|---|---|
| committer | dsc <xmrdsc@protonmail.com> | 2019-04-25 21:09:23 +0200 |
| commit | 62285b01dc77ef14e4b5b9cc291e34162321ad89 (patch) | |
| tree | 5ced9d312817ca03be17c242d1e2bd478b4fd1e5 /components | |
| parent | e1c429110f5f2321ad0113a8097eab966d935dcd (diff) | |
| download | monzero-gui-62285b01dc77ef14e4b5b9cc291e34162321ad89.tar.gz monzero-gui-62285b01dc77ef14e4b5b9cc291e34162321ad89.tar.xz monzero-gui-62285b01dc77ef14e4b5b9cc291e34162321ad89.zip | |
Remove scaleRatio
Diffstat (limited to 'components')
31 files changed, 291 insertions, 291 deletions
diff --git a/components/CheckBox.qml b/components/CheckBox.qml index 15648d3e..d871c649 100644 --- a/components/CheckBox.qml +++ b/components/CheckBox.qml @@ -38,16 +38,16 @@ Item { property alias text: label.text property string checkedIcon: "qrc:///images/check-white.svg" property string uncheckedIcon - property int imgWidth: 13 * scaleRatio - property int imgHeight: 13 * scaleRatio + property int imgWidth: 13 + property int imgHeight: 13 property bool checked: false property alias background: backgroundRect.color property bool border: true - property int fontSize: 14 * scaleRatio + property int fontSize: 14 property alias fontColor: label.color property bool iconOnTheLeft: true signal clicked() - height: 25 * scaleRatio + height: 25 width: checkBoxLayout.width function toggle(){ @@ -58,7 +58,7 @@ Item { RowLayout { id: checkBoxLayout layoutDirection: iconOnTheLeft ? Qt.LeftToRight : Qt.RightToLeft - spacing: (!isMobile ? 10 : 8) * scaleRatio + spacing: (!isMobile ? 10 : 8) Item { id: checkMark diff --git a/components/CheckBox2.qml b/components/CheckBox2.qml index 899f1f1e..08c86e7b 100644 --- a/components/CheckBox2.qml +++ b/components/CheckBox2.qml @@ -39,11 +39,11 @@ RowLayout { id: checkBox property alias text: label.text property bool checked: false - property int fontSize: 14 * scaleRatio + property int fontSize: 14 property alias fontColor: label.color - property int textMargin: 8 * scaleRatio + property int textMargin: 8 signal clicked() - height: 25 * scaleRatio + height: 25 function toggle(){ checkBox.checked = !checkBox.checked @@ -75,13 +75,13 @@ RowLayout { anchors.left: label.right anchors.leftMargin: textMargin color: "transparent" - rotation: checkBox.checked ? 180 * scaleRatio : 0 + rotation: checkBox.checked ? 180 : 0 MoneroEffects.ImageMask { id: indicatorImage anchors.centerIn: parent - width: 12 * scaleRatio - height: 8 * scaleRatio + width: 12 + height: 8 image: "qrc:///images/whiteDropIndicator.png" color: MoneroComponents.Style.defaultFontColor opacity: MoneroComponents.Style.blackTheme ? 1 : 0.75 diff --git a/components/DaemonConsole.qml b/components/DaemonConsole.qml index a27abe79..0138473b 100644 --- a/components/DaemonConsole.qml +++ b/components/DaemonConsole.qml @@ -92,9 +92,9 @@ Window { id: mainLayout anchors.fill: parent - anchors.topMargin: 20 * scaleRatio - anchors.margins: 35 * scaleRatio - spacing: 20 * scaleRatio + anchors.topMargin: 20 + anchors.margins: 35 + spacing: 20 Item { Layout.fillHeight: true @@ -118,7 +118,7 @@ Window { selectByMouse: true selectByKeyboard: true font.family: MoneroComponents.Style.defaultFontColor - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 color: MoneroComponents.Style.defaultFontColor selectionColor: MoneroComponents.Style.textSelectionColor wrapMode: TextEdit.Wrap diff --git a/components/DatePicker.qml b/components/DatePicker.qml index b08d786e..c51e451c 100644 --- a/components/DatePicker.qml +++ b/components/DatePicker.qml @@ -94,7 +94,7 @@ Item { Item { id: head anchors.top: inputLabelRect.bottom - anchors.topMargin: 6 * scaleRatio + anchors.topMargin: 6 anchors.left: parent.left anchors.right: parent.right height: 28 @@ -237,7 +237,7 @@ Item { Image { id: button anchors.right: parent.right - anchors.rightMargin: 10 * scaleRatio + anchors.rightMargin: 10 anchors.verticalCenter: parent.verticalCenter source: "qrc:///images/whiteDropIndicator.png" visible: false @@ -266,7 +266,7 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.top: head.bottom - anchors.topMargin: 10 * scaleRatio + anchors.topMargin: 10 color: MoneroComponents.Style.middlePanelBackgroundColor border.width: 1 border.color: MoneroComponents.Style.appWindowBorderColor @@ -293,7 +293,7 @@ Item { anchors.right: parent.right anchors.top: parent.top anchors.margins: 1 - anchors.bottomMargin: 10 * scaleRatio + anchors.bottomMargin: 10 height: 220 frameVisible: false @@ -396,7 +396,7 @@ Item { Item { anchors.left: parent.left - anchors.leftMargin: 4 * scaleRatio + anchors.leftMargin: 4 anchors.top: parent.top anchors.bottom: parent.bottom width: height @@ -425,7 +425,7 @@ Item { Item { anchors.right: parent.right - anchors.rightMargin: 4 * scaleRatio + anchors.rightMargin: 4 anchors.top: parent.top anchors.bottom: parent.bottom width: height diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml index 949f944f..1f9178e2 100644 --- a/components/HistoryTable.qml +++ b/components/HistoryTable.qml @@ -70,7 +70,7 @@ ListView { } footer: Rectangle { - height: 127 * scaleRatio + height: 127 width: listView.width color: "transparent" @@ -86,12 +86,12 @@ ListView { delegate: Rectangle { id: delegate property bool collapsed: index ? false : true - height: collapsed ? 180 * scaleRatio : 70 * scaleRatio + height: collapsed ? 180 : 70 width: listView.width color: "transparent" function collapse(){ - delegate.height = 180 * scaleRatio; + delegate.height = 180; } // borders @@ -130,29 +130,29 @@ ListView { Rectangle { id: row1 anchors.left: parent.left - anchors.leftMargin: 20 * scaleRatio + anchors.leftMargin: 20 anchors.right: parent.right - anchors.rightMargin: 20 * scaleRatio + anchors.rightMargin: 20 anchors.top: parent.top - anchors.topMargin: 15 * scaleRatio - height: 40 * scaleRatio + anchors.topMargin: 15 + height: 40 color: "transparent" Image { id: arrowImage source: isOut ? "qrc:///images/downArrow.png" : confirmationsRequired === 60 ? "qrc:///images/miningxmr.png" : "qrc:///images/upArrow-green.png" - height: 18 * scaleRatio - width: (confirmationsRequired === 60 ? 18 : 12) * scaleRatio + height: 18 + width: (confirmationsRequired === 60 ? 18 : 12) anchors.top: parent.top - anchors.topMargin: 12 * scaleRatio + anchors.topMargin: 12 } MoneroComponents.TextPlain { id: txrxLabel anchors.left: arrowImage.right - anchors.leftMargin: 18 * scaleRatio + anchors.leftMargin: 18 font.family: MoneroComponents.Style.fontLight.name - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 text: isOut ? qsTr("Sent") + translationManager.emptyString : qsTr("Received") + translationManager.emptyString color: "#808080" } @@ -160,11 +160,11 @@ ListView { MoneroComponents.TextPlain { id: amountLabel anchors.left: arrowImage.right - anchors.leftMargin: 18 * scaleRatio + anchors.leftMargin: 18 anchors.top: txrxLabel.bottom - anchors.topMargin: 0 * scaleRatio + anchors.topMargin: 0 font.family: MoneroComponents.Style.fontBold.name - font.pixelSize: 18 * scaleRatio + font.pixelSize: 18 font.bold: true text: { var _amount = amount; @@ -198,7 +198,7 @@ ListView { Rectangle { anchors.right: parent.right - width: 300 * scaleRatio + width: 300 height: parent.height color: "transparent" @@ -206,7 +206,7 @@ ListView { id: dateLabel anchors.left: parent.left font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 text: date color: "#808080" } @@ -214,10 +214,10 @@ ListView { MoneroComponents.TextPlain { id: timeLabel anchors.left: dateLabel.right - anchors.leftMargin: 7 * scaleRatio + anchors.leftMargin: 7 anchors.top: parent.top - anchors.topMargin: 1 * scaleRatio - font.pixelSize: 12 * scaleRatio + anchors.topMargin: 1 + font.pixelSize: 12 text: time color: "#808080" } @@ -230,7 +230,7 @@ ListView { anchors.top: dateLabel.bottom anchors.topMargin: 0 font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 text: { if(isOut){ address = TxUtils.destinationsToAddress(destinations); @@ -266,16 +266,16 @@ ListView { } Rectangle { - height: 24 * scaleRatio - width: 24 * scaleRatio + height: 24 + width: 24 color: "transparent" anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter Image { id: dropdownImage - height: 8 * scaleRatio - width: 12 * scaleRatio + height: 8 + width: 12 source: "qrc:///images/whiteDropIndicator.png" rotation: delegate.collapsed ? 180 : 0 anchors.horizontalCenter: parent.horizontalCenter @@ -297,19 +297,19 @@ ListView { Rectangle { id: row2 anchors.left: parent.left - anchors.leftMargin: 20 * scaleRatio + anchors.leftMargin: 20 anchors.right: parent.right - anchors.rightMargin: 20 * scaleRatio + anchors.rightMargin: 20 anchors.top: row1.bottom - anchors.topMargin: 15 * scaleRatio - height: 40 * scaleRatio + anchors.topMargin: 15 + height: 40 color: "transparent" visible: delegate.collapsed // left column MoneroComponents.HistoryTableInnerColumn{ anchors.left: parent.left - anchors.leftMargin: 30 * scaleRatio + anchors.leftMargin: 30 labelHeader: qsTr("Transaction ID") + translationManager.emptyString labelValue: hash.substring(0, 18) + "..." @@ -319,8 +319,8 @@ ListView { // right column MoneroComponents.HistoryTableInnerColumn{ anchors.right: parent.right - anchors.rightMargin: 100 * scaleRatio - width: 200 * scaleRatio + anchors.rightMargin: 100 + width: 200 height: parent.height color: "transparent" @@ -345,19 +345,19 @@ ListView { Rectangle { id: row3 anchors.left: parent.left - anchors.leftMargin: 20 * scaleRatio + anchors.leftMargin: 20 anchors.right: parent.right - anchors.rightMargin: 20 * scaleRatio + anchors.rightMargin: 20 anchors.top: row2.bottom - anchors.topMargin: 15 * scaleRatio - height: 40 * scaleRatio + anchors.topMargin: 15 + height: 40 color: "transparent" visible: delegate.collapsed // left column MoneroComponents.HistoryTableInnerColumn{ anchors.left: parent.left - anchors.leftMargin: 30 * scaleRatio + anchors.leftMargin: 30 labelHeader: qsTr("Blockheight") labelValue: { if (!isPending) @@ -377,8 +377,8 @@ ListView { // right column MoneroComponents.HistoryTableInnerColumn { anchors.right: parent.right - anchors.rightMargin: 80 * scaleRatio - width: 220 * scaleRatio + anchors.rightMargin: 80 + width: 220 height: parent.height color: "transparent" hashValue: hash @@ -407,12 +407,12 @@ ListView { id: proofButton visible: isOut color: "#404040" - height: 24 * scaleRatio - width: 24 * scaleRatio + height: 24 + width: 24 anchors.right: parent.right anchors.bottom: parent.bottom anchors.bottomMargin: 36 - radius: 20 * scaleRatio + radius: 20 MouseArea { id: proofButtonMouseArea @@ -449,19 +449,19 @@ ListView { text: "P" anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 } } Rectangle { id: detailsButton color: "#404040" - height: 24 * scaleRatio - width: 24 * scaleRatio + height: 24 + width: 24 anchors.right: parent.right anchors.bottom: parent.bottom anchors.bottomMargin: 6 - radius: 20 * scaleRatio + radius: 20 MouseArea { id: detailsButtonMouseArea @@ -496,7 +496,7 @@ ListView { text: "?" anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 } } } diff --git a/components/InlineButton.qml b/components/InlineButton.qml index c7c68bac..45cf841c 100644 --- a/components/InlineButton.qml +++ b/components/InlineButton.qml @@ -46,9 +46,9 @@ Item { property string releasedColor: "#FF6C3C" property string icon: "" property string textColor: MoneroComponents.Style.inlineButtonTextColor - property int fontSize: small ? 14 * scaleRatio : 16 * scaleRatio - property int rectHeight: small ? 24 * scaleRatio : 24 * scaleRatio - property int rectHMargin: small ? 16 * scaleRatio : 22 * scaleRatio + property int fontSize: small ? 14 : 16 + property int rectHeight: small ? 24 : 24 + property int rectHMargin: small ? 16 : 22 property alias text: inlineText.text property alias fontPixelSize: inlineText.font.pixelSize property alias fontFamily: inlineText.font.family @@ -64,13 +64,13 @@ Item { Rectangle{ id: rect color: MoneroComponents.Style.buttonInlineBackgroundColor - height: 24 * scaleRatio - width: inlineText.text ? (inlineText.width + 16) * scaleRatio : inlineButton.icon ? (inlineImage.width + 16) * scaleRatio : rect.height + height: 24 + width: inlineText.text ? (inlineText.width + 16) : inlineButton.icon ? (inlineImage.width + 16) : rect.height radius: 4 anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - anchors.rightMargin: 4 * scaleRatio + anchors.rightMargin: 4 MoneroComponents.TextPlain { id: inlineText diff --git a/components/Input.qml b/components/Input.qml index c3d345c4..752b461d 100644 --- a/components/Input.qml +++ b/components/Input.qml @@ -33,7 +33,7 @@ import "../components" as MoneroComponents TextField { font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 18 * scaleRatio + font.pixelSize: 18 font.bold: true horizontalAlignment: TextInput.AlignLeft selectByMouse: true diff --git a/components/InputDialog.qml b/components/InputDialog.qml index 8b3414ed..6401b0ce 100644 --- a/components/InputDialog.qml +++ b/components/InputDialog.qml @@ -75,13 +75,13 @@ Item { Layout.fillWidth: true Layout.alignment: Qt.AlignHCenter - Layout.maximumWidth: 400 * scaleRatio + Layout.maximumWidth: 400 Label { id: label Layout.fillWidth: true - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 font.family: MoneroComponents.Style.fontLight.name color: MoneroComponents.Style.defaultFontColor @@ -95,7 +95,7 @@ Item { horizontalAlignment: TextInput.AlignLeft verticalAlignment: TextInput.AlignVCenter font.family: MoneroComponents.Style.fontLight.name - font.pixelSize: 24 * scaleRatio + font.pixelSize: 24 KeyNavigation.tab: okButton bottomPadding: 10 leftPadding: 10 @@ -124,7 +124,7 @@ Item { // Ok/Cancel buttons RowLayout { id: buttons - spacing: 16 * scaleRatio + spacing: 16 Layout.topMargin: 16 Layout.alignment: Qt.AlignRight diff --git a/components/InputMulti.qml b/components/InputMulti.qml index 4fea31c4..891bdc4f 100644 --- a/components/InputMulti.qml +++ b/components/InputMulti.qml @@ -33,7 +33,7 @@ import "../js/TxUtils.js" as TxUtils import "../components" as MoneroComponents TextArea { - property int fontSize: 18 * scaleRatio + property int fontSize: 18 property bool fontBold: false property string fontColor: MoneroComponents.Style.defaultFontColor @@ -51,7 +51,7 @@ TextArea { selectionColor: MoneroComponents.Style.textSelectionColor selectedTextColor: MoneroComponents.Style.textSelectedColor - property int minimumHeight: 100 * scaleRatio + property int minimumHeight: 100 height: contentHeight > minimumHeight ? contentHeight : minimumHeight onTextChanged: { diff --git a/components/Label.qml b/components/Label.qml index 2ab9463d..bc9ecd34 100644 --- a/components/Label.qml +++ b/components/Label.qml @@ -37,7 +37,7 @@ Item { property alias color: label.color property int textFormat: Text.PlainText property string tipText: "" - property int fontSize: 16 * scaleRatio + property int fontSize: 16 property bool fontBold: false property string fontColor: MoneroComponents.Style.defaultFontColor property string fontFamily: "" @@ -47,14 +47,14 @@ Item { property alias textWidth: label.width property alias themeTransition: label.themeTransition signal linkActivated() - height: label.height * scaleRatio - width: label.width * scaleRatio - Layout.topMargin: 10 * scaleRatio + height: label.height + width: label.width + Layout.topMargin: 10 MoneroComponents.TextPlain { id: label anchors.bottom: parent.bottom - anchors.bottomMargin: 2 * scaleRatio + anchors.bottomMargin: 2 anchors.left: parent.left font.family: { if(fontFamily){ diff --git a/components/LabelSubheader.qml b/components/LabelSubheader.qml index 7a74a378..585d0027 100644 --- a/components/LabelSubheader.qml +++ b/components/LabelSubheader.qml @@ -33,7 +33,7 @@ import "../components/effects/" as MoneroEffects Label { id: item - fontSize: 18 * scaleRatio + fontSize: 18 Rectangle { anchors.top: item.bottom diff --git a/components/LanguageSidebar.qml b/components/LanguageSidebar.qml index 94957e0b..f67cde7b 100644 --- a/components/LanguageSidebar.qml +++ b/components/LanguageSidebar.qml @@ -48,7 +48,7 @@ Drawer { isOpened = true; } - width: 240 * scaleRatio + width: 240 height: parent.height - (persistentSettings.customDecorations ? 50 : 0) y: titleBar.height @@ -77,13 +77,13 @@ Drawer { id: item color: "transparent" width: sideBar.width - height: 32 * scaleRatio + height: 32 MoneroComponents.TextPlain { anchors.left: parent.left - anchors.leftMargin: 16 * scaleRatio + anchors.leftMargin: 16 font.bold: true - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 color: MoneroComponents.Style.defaultFontColor text: display_name anchors.verticalCenter: parent.verticalCenter diff --git a/components/LineEdit.qml b/components/LineEdit.qml index f3016137..68e981fa 100644 --- a/components/LineEdit.qml +++ b/components/LineEdit.qml @@ -40,7 +40,7 @@ Item { property bool placeholderCenter: false property string placeholderFontFamily: MoneroComponents.Style.fontRegular.name property bool placeholderFontBold: false - property int placeholderFontSize: 18 * scaleRatio + property int placeholderFontSize: 18 property string placeholderColor: MoneroComponents.Style.defaultFontColor property real placeholderOpacity: 0.35 @@ -65,7 +65,7 @@ Item { } } - property int fontSize: 18 * scaleRatio + property int fontSize: 18 property bool fontBold: false property alias fontColor: input.color property bool error: false @@ -74,19 +74,19 @@ Item { property alias labelTextFormat: inputLabel.textFormat property string backgroundColor: "transparent" property string tipText: "" - property int labelFontSize: 16 * scaleRatio + property int labelFontSize: 16 property bool labelFontBold: false property alias labelWrapMode: inputLabel.wrapMode property alias labelHorizontalAlignment: inputLabel.horizontalAlignment property bool showingHeader: inputLabel.text !== "" || copyButton - property int inputHeight: 42 * scaleRatio + property int inputHeight: 42 signal labelLinkActivated(); // input label, rich text <a> signal signal editingFinished(); signal accepted(); signal textUpdated(); - height: showingHeader ? (inputLabel.height + inputItem.height + 2) * scaleRatio : 42 * scaleRatio + height: showingHeader ? (inputLabel.height + inputItem.height + 2) : 42 onTextUpdated: { // check to remove placeholder text when there is content @@ -141,9 +141,9 @@ Item { Item{ id: inputItem - height: inputHeight * scaleRatio + height: inputHeight anchors.top: showingHeader ? inputLabel.bottom : parent.top - anchors.topMargin: showingHeader ? 12 * scaleRatio : 2 * scaleRatio + anchors.topMargin: showingHeader ? 12 : 2 width: parent.width clip: true @@ -157,14 +157,14 @@ Item { if(placeholderCenter){ return undefined; } - else if(inlineIcon.visible){ return 50 * scaleRatio; } - else { return 10 * scaleRatio; } + else if(inlineIcon.visible){ return 50; } + else { return 10; } } opacity: item.placeholderOpacity color: item.placeholderColor font.family: item.placeholderFontFamily - font.pixelSize: placeholderFontSize * scaleRatio + font.pixelSize: placeholderFontSize font.bold: item.placeholderFontBold text: "" z: 3 @@ -172,7 +172,7 @@ Item { Rectangle { anchors.fill: parent - anchors.topMargin: 1 * scaleRatio + anchors.topMargin: 1 color: "transparent" } @@ -187,12 +187,12 @@ Item { Image { id: inlineIcon - width: 26 * scaleRatio - height: 26 * scaleRatio + width: 26 + height: 26 anchors.top: parent.top - anchors.topMargin: 8 * scaleRatio + anchors.topMargin: 8 anchors.left: parent.left - anchors.leftMargin: 12 * scaleRatio + anchors.leftMargin: 12 source: "qrc:///images/moneroIcon-28x28.png" visible: false } @@ -200,21 +200,21 @@ Item { MoneroComponents.Input { id: input anchors.fill: parent - anchors.leftMargin: inlineIcon.visible ? 44 * scaleRatio : 0 + anchors.leftMargin: inlineIcon.visible ? 44 : 0 font.pixelSize: item.fontSize font.bold: item.fontBold onEditingFinished: item.editingFinished() onAccepted: item.accepted(); onTextChanged: item.textUpdated() - topPadding: 10 * scaleRatio - bottomPadding: 10 * scaleRatio + topPadding: 10 + bottomPadding: 10 } MoneroComponents.InlineButton { id: inlineButtonId visible: item.inlineButtonText ? true : false anchors.right: parent.right - anchors.rightMargin: 8 * scaleRatio + anchors.rightMargin: 8 } } } diff --git a/components/LineEditMulti.qml b/components/LineEditMulti.qml index f95961cb..266c6a30 100644 --- a/components/LineEditMulti.qml +++ b/components/LineEditMulti.qml @@ -41,16 +41,16 @@ ColumnLayout { property alias labelButtonText: labelButton.text property alias placeholderText: placeholderLabel.text - property int inputPaddingLeft: 10 * scaleRatio - property int inputPaddingRight: 10 * scaleRatio - property int inputPaddingTop: 10 * scaleRatio - property int inputPaddingBottom: 10 * scaleRatio + property int inputPaddingLeft: 10 + property int inputPaddingRight: 10 + property int inputPaddingTop: 10 + property int inputPaddingBottom: 10 property int inputRadius: 4 property bool placeholderCenter: false property string placeholderFontFamily: MoneroComponents.Style.fontRegular.name property bool placeholderFontBold: false - property int placeholderFontSize: 18 * scaleRatio + property int placeholderFontSize: 18 property string placeholderColor: MoneroComponents.Style.defaultFontColor property real placeholderOpacity: 0.35 @@ -69,12 +69,12 @@ ColumnLayout { property string labelFontColor: MoneroComponents.Style.defaultFontColor property bool labelFontBold: false - property int labelFontSize: 16 * scaleRatio + property int labelFontSize: 16 property bool labelButtonVisible: false property string fontColor: MoneroComponents.Style.defaultFontColor property bool fontBold: false - property int fontSize: 16 * scaleRatio + property int fontSize: 16 property bool mouseSelection: true property alias readOnly: input.readOnly @@ -100,7 +100,7 @@ ColumnLayout { id: inputLabelRect color: "transparent" Layout.fillWidth: true - height: (inputLabel.height + 10) * scaleRatio + height: (inputLabel.height + 10) visible: showingHeader ? true : false MoneroComponents.TextPlain { @@ -123,7 +123,7 @@ ColumnLayout { RowLayout { anchors.right: parent.right - spacing: 16 * scaleRatio + spacing: 16 MoneroComponents.LabelButton { id: labelButton @@ -177,7 +177,7 @@ ColumnLayout { visible: input.text ? false : true anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - anchors.leftMargin: 10 * scaleRatio + anchors.leftMargin: 10 opacity: item.placeholderOpacity color: item.placeholderColor font.family: item.placeholderFontFamily @@ -200,7 +200,7 @@ ColumnLayout { id: inlineButtonId visible: (inlineButtonId.text || inlineButtonId.icon) && inlineButtonVisible ? true : false anchors.right: parent.right - anchors.rightMargin: 8 * scaleRatio + anchors.rightMargin: 8 } } } diff --git a/components/MenuButton.qml b/components/MenuButton.qml index a4aa236f..93fc3b9f 100644 --- a/components/MenuButton.qml +++ b/components/MenuButton.qml @@ -52,7 +52,7 @@ Rectangle { var offset = 0 var item = button while (item.under) { - offset += 20 * scaleRatio + offset += 20 item = item.under } return offset @@ -60,7 +60,7 @@ Rectangle { color: "transparent" property bool present: !under || under.checked || checked || under.numSelectedChildren > 0 - height: present ? ((appWindow.height >= 800) ? 44 * scaleRatio : 38 * scaleRatio ) : 0 + height: present ? ((appWindow.height >= 800) ? 44 : 38 ) : 0 LinearGradient { visible: isOpenGL && button.checked @@ -88,7 +88,7 @@ Rectangle { // button decorations that are subject to leftMargin offsets Rectangle { anchors.left: parent.left - anchors.leftMargin: parent.getOffset() + 20 * scaleRatio + anchors.leftMargin: parent.getOffset() + 20 height: parent.height width: button.checked ? 20: 10 color: "transparent" @@ -97,9 +97,9 @@ Rectangle { Rectangle { id: dot anchors.centerIn: parent - width: button.checked ? 20 * scaleRatio : 8 * scaleRatio - height: button.checked ? 20 * scaleRatio : 8 * scaleRatio - radius: button.checked ? 20 * scaleRatio : 4 * scaleRatio + width: button.checked ? 20 : 8 + height: button.checked ? 20 : 8 + radius: button.checked ? 20 : 4 color: button.dotColor // arrow if checked Image { @@ -118,9 +118,9 @@ Rectangle { themeTransitionWhiteColor: MoneroComponents.Style._w_menuButtonTextColor anchors.verticalCenter: parent.verticalCenter anchors.left: parent.right - anchors.leftMargin: 8 * scaleRatio + anchors.leftMargin: 8 font.bold: true - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 } } @@ -129,7 +129,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter anchors.leftMargin: parent.getOffset() anchors.right: parent.right - anchors.rightMargin: 20 * scaleRatio + anchors.rightMargin: 20 height: 14 width: 8 image: MoneroComponents.Style.menuButtonImageRightSource @@ -140,9 +140,9 @@ Rectangle { MoneroComponents.TextPlain { id: symbolText anchors.right: parent.right - anchors.rightMargin: 44 * scaleRatio + anchors.rightMargin: 44 anchors.verticalCenter: parent.verticalCenter - font.pixelSize: 12 * scaleRatio + font.pixelSize: 12 font.bold: true color: button.checked || buttonArea.containsMouse ? MoneroComponents.Style.menuButtonTextColor : dot.color visible: appWindow.ctrlPressed diff --git a/components/MobileHeader.qml b/components/MobileHeader.qml index 8b8431b9..abf5580e 100644 --- a/components/MobileHeader.qml +++ b/components/MobileHeader.qml @@ -11,16 +11,16 @@ Rectangle { anchors.leftMargin: 1 anchors.rightMargin: 1 Layout.fillWidth: true - Layout.preferredHeight: 64 * scaleRatio + Layout.preferredHeight: 64 color: "#FFFFFF" Image { id: logo - visible: appWindow.width > 460 * scaleRatio + visible: appWindow.width > 460 anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: -5 anchors.left: parent.left - anchors.leftMargin: 50 * scaleRatio + anchors.leftMargin: 50 source: "qrc:///images/moneroLogo2.png" } @@ -29,7 +29,7 @@ Rectangle { visible: !logo.visible anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - anchors.leftMargin: 40 * scaleRatio + anchors.leftMargin: 40 source: "qrc:///images/moneroIcon.png" } @@ -37,16 +37,16 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter anchors.top: parent.top anchors.right: parent.right - anchors.topMargin: 10 * scaleRatio - width: 256 * scaleRatio + anchors.topMargin: 10 + width: 256 columns: 3 MoneroComponents.TextPlain { id: balanceLabel - width: 116 * scaleRatio - height: 20 * scaleRatio + width: 116 + height: 20 font.family: "Arial" - font.pixelSize: 12 * scaleRatio + font.pixelSize: 12 font.letterSpacing: -1 elide: Text.ElideRight horizontalAlignment: Text.AlignLeft @@ -57,10 +57,10 @@ Rectangle { MoneroComponents.TextPlain { id: balanceText - width: 110 * scaleRatio - height: 20 * scaleRatio + width: 110 + height: 20 font.family: "Arial" - font.pixelSize: 18 * scaleRatio + font.pixelSize: 18 font.letterSpacing: -1 elide: Text.ElideRight horizontalAlignment: Text.AlignLeft @@ -70,8 +70,8 @@ Rectangle { } Item { - height: 20 * scaleRatio - width: 20 * scaleRatio + height: 20 + width: 20 Image { anchors.verticalCenter: parent.verticalCenter @@ -81,10 +81,10 @@ Rectangle { } MoneroComponents.TextPlain { - width: 116 * scaleRatio - height: 20 * scaleRatio + width: 116 + height: 20 font.family: "Arial" - font.pixelSize: 12 * scaleRatio + font.pixelSize: 12 font.letterSpacing: -1 elide: Text.ElideRight horizontalAlignment: Text.AlignLeft @@ -95,10 +95,10 @@ Rectangle { MoneroComponents.TextPlain { id: availableBalanceText - width: 110 * scaleRatio - height: 20 * scaleRatio + width: 110 + height: 20 font.family: "Arial" - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 font.letterSpacing: -1 elide: Text.ElideRight horizontalAlignment: Text.AlignLeft diff --git a/components/NetworkStatusItem.qml b/components/NetworkStatusItem.qml index a5ca56fa..7533be81 100644 --- a/components/NetworkStatusItem.qml +++ b/components/NetworkStatusItem.qml @@ -58,12 +58,12 @@ Rectangle { } RowLayout { - Layout.preferredHeight: 40 * scaleRatio + Layout.preferredHeight: 40 Item { id: iconItem - width: 40 * scaleRatio - height: 40 * scaleRatio + width: 40 + height: 40 opacity: { if(item.connected == Wallet.ConnectionStatus_Connected){ return 1 @@ -74,9 +74,9 @@ Rectangle { Image { anchors.top: parent.top - anchors.topMargin: !appWindow.isMining ? 6 * scaleRatio : 4 * scaleRatio + anchors.topMargin: !appWindow.isMining ? 6 : 4 anchors.right: parent.right - anchors.rightMargin: !appWindow.isMining ? 11 * scaleRatio : 0 + anchors.rightMargin: !appWindow.isMining ? 11 : 0 source: { if(appWindow.isMining) { return "qrc:///images/miningxmr.png" @@ -102,8 +102,8 @@ Rectangle { } Item { - height: 40 * scaleRatio - width: 260 * scaleRatio + height: 40 + width: 260 MoneroComponents.TextPlain { id: statusText @@ -112,7 +112,7 @@ Rectangle { anchors.topMargin: 0 font.family: MoneroComponents.Style.fontMedium.name font.bold: true - font.pixelSize: 13 * scaleRatio + font.pixelSize: 13 color: MoneroComponents.Style.dimmedFontColor opacity: MoneroComponents.Style.blackTheme ? 0.65 : 0.5 text: qsTr("Network status") + translationManager.emptyString @@ -125,7 +125,7 @@ Rectangle { anchors.top: parent.top anchors.topMargin: 14 font.family: MoneroComponents.Style.fontMedium.name - font.pixelSize: 20 * scaleRatio + font.pixelSize: 20 color: MoneroComponents.Style.defaultFontColor text: getConnectionStatusString(item.connected) + translationManager.emptyString opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.7 diff --git a/components/NewPasswordDialog.qml b/components/NewPasswordDialog.qml index ecf394b0..672bba8e 100644 --- a/components/NewPasswordDialog.qml +++ b/components/NewPasswordDialog.qml @@ -96,20 +96,20 @@ Item { z: inactiveOverlay.z + 1 id: mainLayout spacing: 10 - anchors { fill: parent; margins: 35 * scaleRatio } + anchors { fill: parent; margins: 35 } ColumnLayout { id: column Layout.fillWidth: true Layout.alignment: Qt.AlignHCenter - Layout.maximumWidth: 400 * scaleRatio + Layout.maximumWidth: 400 Label { text: qsTr("Please enter new password") + translationManager.emptyString Layout.fillWidth: true - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 font.family: MoneroComponents.Style.fontLight.name color: MoneroComponents.Style.defaultFontColor @@ -122,7 +122,7 @@ Item { horizontalAlignment: TextInput.AlignLeft verticalAlignment: TextInput.AlignVCenter font.family: MoneroComponents.Style.fontLight.name - font.pixelSize: 24 * scaleRatio + font.pixelSize: 24 echoMode: TextInput.Password bottomPadding: 10 leftPadding: 10 @@ -139,8 +139,8 @@ Item { color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF" Image { - width: 26 * scaleRatio - height: 26 * scaleRatio + width: 26 + height: 26 opacity: 0.7 fillMode: Image.PreserveAspectFit source: isHidden ? "qrc:///images/eyeShow.png" : "qrc:///images/eyeHide.png" @@ -156,13 +156,13 @@ Item { } onEntered: { parent.opacity = 0.9 - parent.width = 28 * scaleRatio - parent.height = 28 * scaleRatio + parent.width = 28 + parent.height = 28 } onExited: { parent.opacity = 0.7 - parent.width = 26 * scaleRatio - parent.height = 26 * scaleRatio + parent.width = 26 + parent.height = 26 } } } @@ -187,7 +187,7 @@ Item { text: qsTr("Please confirm new password") + translationManager.emptyString Layout.fillWidth: true - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 font.family: MoneroComponents.Style.fontLight.name color: MoneroComponents.Style.defaultFontColor @@ -200,7 +200,7 @@ Item { horizontalAlignment: TextInput.AlignLeft verticalAlignment: TextInput.AlignVCenter font.family: MoneroComponents.Style.fontLight.name - font.pixelSize: 24 * scaleRatio + font.pixelSize: 24 echoMode: TextInput.Password KeyNavigation.tab: okButton bottomPadding: 10 @@ -217,8 +217,8 @@ Item { color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF" Image { - width: 26 * scaleRatio - height: 26 * scaleRatio + width: 26 + height: 26 opacity: 0.7 fillMode: Image.PreserveAspectFit source: isHidden ? "qrc:///images/eyeShow.png" : "qrc:///images/eyeHide.png" @@ -235,13 +235,13 @@ Item { } onEntered: { parent.opacity = 0.9 - parent.width = 28 * scaleRatio - parent.height = 28 * scaleRatio + parent.width = 28 + parent.height = 28 } onExited: { parent.opacity = 0.7 - parent.width = 26 * scaleRatio - parent.height = 26 * scaleRatio + parent.width = 26 + parent.height = 26 } } } @@ -271,7 +271,7 @@ Item { // Ok/Cancel buttons RowLayout { id: buttons - spacing: 16 * scaleRatio + spacing: 16 Layout.topMargin: 16 Layout.alignment: Qt.AlignRight diff --git a/components/PassphraseDialog.qml b/components/PassphraseDialog.qml index 704c6c3c..9b2d7956 100644 --- a/components/PassphraseDialog.qml +++ b/components/PassphraseDialog.qml @@ -107,20 +107,20 @@ Item { z: inactiveOverlay.z + 1 id: mainLayout spacing: 10 - anchors { fill: parent; margins: 35 * scaleRatio } + anchors { fill: parent; margins: 35 } ColumnLayout { id: column Layout.fillWidth: true Layout.alignment: Qt.AlignHCenter - Layout.maximumWidth: 400 * scaleRatio + Layout.maximumWidth: 400 Label { text: (root.walletName.length > 0 ? qsTr("Please enter wallet device passphrase for: ") + root.walletName : qsTr("Please enter wallet device passphrase")) + translationManager.emptyString Layout.fillWidth: true - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 font.family: MoneroComponents.Style.fontLight.name color: MoneroComponents.Style.defaultFontColor @@ -131,7 +131,7 @@ Item { Layout.fillWidth: true wrapMode: Text.Wrap - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 font.family: MoneroComponents.Style.fontLight.name color: MoneroComponents.Style.warningColor @@ -142,7 +142,7 @@ Item { visible: root.errorText color: MoneroComponents.Style.errorColor - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 font.family: MoneroComponents.Style.fontLight.name Layout.fillWidth: true wrapMode: Text.Wrap @@ -155,7 +155,7 @@ Item { horizontalAlignment: TextInput.AlignLeft verticalAlignment: TextInput.AlignVCenter font.family: MoneroComponents.Style.fontLight.name - font.pixelSize: 24 * scaleRatio + font.pixelSize: 24 echoMode: TextInput.Password bottomPadding: 10 leftPadding: 10 @@ -172,8 +172,8 @@ Item { color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF" Image { - width: 26 * scaleRatio - height: 26 * scaleRatio + width: 26 + height: 26 opacity: 0.7 fillMode: Image.PreserveAspectFit source: isHidden ? "qrc:///images/eyeShow.png" : "qrc:///images/eyeHide.png" @@ -189,13 +189,13 @@ Item { } onEntered: { parent.opacity = 0.9 - parent.width = 28 * scaleRatio - parent.height = 28 * scaleRatio + parent.width = 28 + parent.height = 28 } onExited: { parent.opacity = 0.7 - parent.width = 26 * scaleRatio - parent.height = 26 * scaleRatio + parent.width = 26 + parent.height = 26 } } } @@ -220,7 +220,7 @@ Item { text: qsTr("Please re-enter") + translationManager.emptyString Layout.fillWidth: true - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 font.family: MoneroComponents.Style.fontLight.name color: MoneroComponents.Style.defaultFontColor @@ -233,7 +233,7 @@ Item { horizontalAlignment: TextInput.AlignLeft verticalAlignment: TextInput.AlignVCenter font.family: MoneroComponents.Style.fontLight.name - font.pixelSize: 24 * scaleRatio + font.pixelSize: 24 echoMode: TextInput.Password KeyNavigation.tab: okButton bottomPadding: 10 @@ -250,8 +250,8 @@ Item { color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF" Image { - width: 26 * scaleRatio - height: 26 * scaleRatio + width: 26 + height: 26 opacity: 0.7 fillMode: Image.PreserveAspectFit source: isHidden ? "qrc:///images/eyeShow.png" : "qrc:///images/eyeHide.png" @@ -267,13 +267,13 @@ Item { } onEntered: { parent.opacity = 0.9 - parent.width = 28 * scaleRatio - parent.height = 28 * scaleRatio + parent.width = 28 + parent.height = 28 } onExited: { parent.opacity = 0.7 - parent.width = 26 * scaleRatio - parent.height = 26 * scaleRatio + parent.width = 26 + parent.height = 26 } } } @@ -303,7 +303,7 @@ Item { // Ok/Cancel buttons RowLayout { id: buttons - spacing: 16 * scaleRatio + spacing: 16 Layout.topMargin: 16 Layout.alignment: Qt.AlignRight diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml index e9b06546..fe1176e0 100644 --- a/components/PasswordDialog.qml +++ b/components/PasswordDialog.qml @@ -95,20 +95,20 @@ Item { z: inactiveOverlay.z + 1 id: mainLayout spacing: 10 - anchors { fill: parent; margins: 35 * scaleRatio } + anchors { fill: parent; margins: 35 } ColumnLayout { id: column Layout.fillWidth: true Layout.alignment: Qt.AlignHCenter - Layout.maximumWidth: 400 * scaleRatio + Layout.maximumWidth: 400 Label { text: (root.walletName.length > 0 ? qsTr("Please enter wallet password for: ") + root.walletName : qsTr("Please enter wallet password")) + translationManager.emptyString Layout.fillWidth: true - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 font.family: MoneroComponents.Style.fontLight.name color: MoneroComponents.Style.defaultFontColor @@ -119,7 +119,7 @@ Item { visible: root.errorText || text !== "" color: MoneroComponents.Style.errorColor - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 font.family: MoneroComponents.Style.fontLight.name Layout.fillWidth: true wrapMode: Text.Wrap @@ -132,7 +132,7 @@ Item { horizontalAlignment: TextInput.AlignLeft verticalAlignment: TextInput.AlignVCenter font.family: MoneroComponents.Style.fontLight.name - font.pixelSize: 24 * scaleRatio + font.pixelSize: 24 echoMode: TextInput.Password KeyNavigation.tab: okButton bottomPadding: 10 @@ -166,8 +166,8 @@ Item { } Image { - width: 26 * scaleRatio - height: 26 * scaleRatio + width: 26 + height: 26 opacity: 0.7 fillMode: Image.PreserveAspectFit source: isHidden ? "qrc:///images/eyeShow.png" : "qrc:///images/eyeHide.png" @@ -185,13 +185,13 @@ Item { } onEntered: { parent.opacity = 0.9 - parent.width = 28 * scaleRatio - parent.height = 28 * scaleRatio + parent.width = 28 + parent.height = 28 } onExited: { parent.opacity = 0.7 - parent.width = 26 * scaleRatio - parent.height = 26 * scaleRatio + parent.width = 26 + parent.height = 26 } } } @@ -227,7 +227,7 @@ Item { // Ok/Cancel buttons RowLayout { id: buttons - spacing: 16 * scaleRatio + spacing: 16 Layout.topMargin: 16 Layout.alignment: Qt.AlignRight diff --git a/components/ProcessingSplash.qml b/components/ProcessingSplash.qml index 47f441b6..9211fa02 100644 --- a/components/ProcessingSplash.qml +++ b/components/ProcessingSplash.qml @@ -41,8 +41,8 @@ Rectangle { property alias messageText: messageTitle.text property alias heightProgressText : heightProgress.text - width: 200 * scaleRatio - height: 100 * scaleRatio + width: 200 + height: 100 opacity: 0.7 function show() { @@ -60,8 +60,8 @@ Rectangle { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - anchors.leftMargin: 30 * scaleRatio - anchors.rightMargin: 30 * scaleRatio + anchors.leftMargin: 30 + anchors.rightMargin: 30 spacing: 12 @@ -74,7 +74,7 @@ Rectangle { id: messageTitle text: "Please wait..." font { - pixelSize: 22 * scaleRatio + pixelSize: 22 } horizontalAlignment: Text.AlignHCenter Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter @@ -87,7 +87,7 @@ Rectangle { MoneroComponents.TextPlain { id: heightProgress font { - pixelSize: 18 * scaleRatio + pixelSize: 18 } horizontalAlignment: Text.AlignHCenter Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter diff --git a/components/ProgressBar.qml b/components/ProgressBar.qml index 491727d5..c11f3b1a 100644 --- a/components/ProgressBar.qml +++ b/components/ProgressBar.qml @@ -56,9 +56,9 @@ Rectangle { Item { anchors.top: item.top - anchors.topMargin: 10 * scaleRatio - anchors.leftMargin: 15 * scaleRatio - anchors.rightMargin: 15 * scaleRatio + anchors.topMargin: 10 + anchors.leftMargin: 15 + anchors.rightMargin: 15 anchors.fill: parent MoneroComponents.TextPlain { @@ -66,11 +66,11 @@ Rectangle { anchors.top: parent.top anchors.topMargin: 6 font.family: MoneroComponents.Style.fontMedium.name - font.pixelSize: 13 * scaleRatio + font.pixelSize: 13 font.bold: MoneroComponents.Style.progressBarProgressTextBold color: MoneroComponents.Style.defaultFontColor text: qsTr("Synchronizing %1").arg(syncType) + translationManager.emptyString - height: 18 * scaleRatio + height: 18 } MoneroComponents.TextPlain { @@ -79,10 +79,10 @@ Rectangle { anchors.topMargin: 6 anchors.right: parent.right font.family: MoneroComponents.Style.fontMedium.name - font.pixelSize: 13 * scaleRatio + font.pixelSize: 13 font.bold: MoneroComponents.Style.progressBarProgressTextBold color: MoneroComponents.Style.defaultFontColor - height:18 * scaleRatio + height:18 } Rectangle { @@ -91,8 +91,8 @@ Rectangle { anchors.right: parent.right anchors.top: progressText.bottom anchors.topMargin: 4 - height: 8 * scaleRatio - radius: 8 * scaleRatio + height: 8 + radius: 8 color: MoneroComponents.Style.progressBarBackgroundColor states: [ @@ -118,7 +118,7 @@ Rectangle { anchors.bottom: parent.bottom anchors.left: parent.left height: bar.height - property int maxWidth: bar.width * scaleRatio + property int maxWidth: bar.width width: (maxWidth * fillLevel) / 100 radius: 8 color: "#FA6800" @@ -128,7 +128,7 @@ Rectangle { color:"#333" anchors.bottom: parent.bottom anchors.left: parent.left - anchors.leftMargin: 8 * scaleRatio + anchors.leftMargin: 8 } } diff --git a/components/RadioButton.qml b/components/RadioButton.qml index cde2bb90..b0f21ca0 100644 --- a/components/RadioButton.qml +++ b/components/RadioButton.qml @@ -35,10 +35,10 @@ Item { id: radioButton property alias text: label.text property bool checked: false - property int fontSize: 14 * scaleRatio + property int fontSize: 14 property alias fontColor: label.color signal clicked() - height: 26 * scaleRatio + height: 26 width: layout.width // legacy properties property var checkedColor: MoneroComponents.Style.blackTheme ? "white" : "#666666" @@ -65,8 +65,8 @@ Item { anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter color: checkedColor - width: 10 * scaleRatio - height: 10 * scaleRatio + width: 10 + height: 10 radius: 10 opacity: 0.8 } @@ -74,7 +74,7 @@ Item { MoneroComponents.TextPlain { id: label - Layout.leftMargin: (!isMobile ? 10 : 8) * scaleRatio + Layout.leftMargin: (!isMobile ? 10 : 8) color: MoneroComponents.Style.defaultFontColor font.family: MoneroComponents.Style.fontRegular.name font.pixelSize: radioButton.fontSize diff --git a/components/RemoteNodeEdit.qml b/components/RemoteNodeEdit.qml index 0cec2171..b575df3b 100644 --- a/components/RemoteNodeEdit.qml +++ b/components/RemoteNodeEdit.qml @@ -47,16 +47,16 @@ GridLayout { // the wizards get redesigned to the black-theme property string placeholderFontFamily: MoneroComponents.Style.fontRegular.name property bool placeholderFontBold: false - property int placeholderFontSize: 15 * scaleRatio + property int placeholderFontSize: 15 property string placeholderColor: MoneroComponents.Style.defaultFontColor property real placeholderOpacity: 0.35 - property int labelFontSize: 14 * scaleRatio + property int labelFontSize: 14 property string lineEditBackgroundColor: "transparent" property string lineEditBorderColor: MoneroComponents.Style.inputBorderColorInActive property string lineEditFontColor: MoneroComponents.Style.defaultFontColor property bool lineEditFontBold: false - property int lineEditFontSize: 15 * scaleRatio + property int lineEditFontSize: 15 signal editingFinished() signal textChanged() diff --git a/components/StandardButton.qml b/components/StandardButton.qml index 05ee16a0..28572245 100644 --- a/components/StandardButton.qml +++ b/components/StandardButton.qml @@ -39,14 +39,14 @@ Item { property bool small: false property alias text: label.text property int fontSize: { - if(small) return 14 * scaleRatio; - else return 16 * scaleRatio; + if(small) return 14; + else return 16; } property alias label: label signal clicked() - height: small ? 30 * scaleRatio : 36 * scaleRatio - width: buttonLayout.width + 22 * scaleRatio + height: small ? 30 : 36 + width: buttonLayout.width + 22 implicitHeight: height implicitWidth: width @@ -100,7 +100,7 @@ Item { RowLayout { id: buttonLayout height: button.height - spacing: 11 * scaleRatio + spacing: 11 anchors.centerIn: parent MoneroComponents.TextPlain { @@ -127,8 +127,8 @@ Item { Image { visible: button.rightIcon !== "" Layout.alignment: Qt.AlignVCenter | Qt.AlignRight - width: button.small ? 16 * scaleRatio : 20 * scaleRatio - height: button.small ? 16 * scaleRatio : 20 * scaleRatio + width: button.small ? 16 : 20 + height: button.small ? 16 : 20 source: { if(button.rightIconInactive !== "" && !button.enabled) { return button.rightIconInactive; diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml index ba5b198e..b8694d9d 100644 --- a/components/StandardDialog.qml +++ b/components/StandardDialog.qml @@ -97,23 +97,23 @@ Rectangle { } // TODO: implement without hardcoding sizes - width: isMobile ? screenWidth : 520 * scaleRatio - height: isMobile ? screenHeight : 380 * scaleRatio + width: isMobile ? screenWidth : 520 + height: isMobile ? screenHeight : 380 ColumnLayout { id: mainLayout - spacing: 10 * scaleRatio + spacing: 10 anchors.fill: parent - anchors.margins: (isMobile? 17 : 20) * scaleRatio + anchors.margins: (isMobile? 17 : 20) RowLayout { id: column - Layout.topMargin: 14 * scaleRatio + Layout.topMargin: 14 Layout.fillWidth: true MoneroComponents.Label { id: dialogTitle - fontSize: 18 * scaleRatio + fontSize: 18 fontFamily: "Arial" color: MoneroComponents.Style.defaultFontColor } @@ -122,7 +122,7 @@ Rectangle { Item { Layout.fillHeight: true Layout.fillWidth: true - Layout.preferredHeight: 240 * scaleRatio + Layout.preferredHeight: 240 Flickable { id: flickable @@ -137,7 +137,7 @@ Rectangle { font.family: MoneroComponents.Style.fontLight.name textFormat: TextEdit.AutoText readOnly: true - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 selectByMouse: false wrapMode: TextEdit.Wrap color: MoneroComponents.Style.defaultFontColor @@ -162,7 +162,7 @@ Rectangle { // Ok/Cancel buttons RowLayout { id: buttons - spacing: 60 * scaleRatio + spacing: 60 Layout.alignment: Qt.AlignHCenter MoneroComponents.StandardButton { @@ -191,14 +191,14 @@ Rectangle { id: closeButton anchors.top: parent.top anchors.right: parent.right - width: 48 * scaleRatio - height: 48 * scaleRatio + width: 48 + height: 48 color: "transparent" MoneroEffects.ImageMask { anchors.centerIn: parent - width: 16 * scaleRatio - height: 16 * scaleRatio + width: 16 + height: 16 image: MoneroComponents.Style.titleBarCloseSource color: MoneroComponents.Style.defaultFontColor opacity: 0.75 @@ -218,7 +218,7 @@ Rectangle { // window borders Rectangle{ - width: 1 * scaleRatio + width: 1 color: MoneroComponents.Style.grey anchors.left: parent.left anchors.top: parent.top @@ -226,7 +226,7 @@ Rectangle { } Rectangle{ - width: 1 * scaleRatio + width: 1 color: MoneroComponents.Style.grey anchors.right: parent.right anchors.top: parent.top @@ -234,7 +234,7 @@ Rectangle { } Rectangle{ - height: 1 * scaleRatio + height: 1 color: MoneroComponents.Style.grey anchors.left: parent.left anchors.top: parent.top @@ -242,7 +242,7 @@ Rectangle { } Rectangle{ - height: 1 * scaleRatio + height: 1 color: MoneroComponents.Style.grey anchors.left: parent.left anchors.bottom: parent.bottom diff --git a/components/StandardDropdown.qml b/components/StandardDropdown.qml index 0eeab407..35d2475d 100644 --- a/components/StandardDropdown.qml +++ b/components/StandardDropdown.qml @@ -44,8 +44,8 @@ Item { property alias currentIndex: columnid.currentIndex property bool expanded: false property int dropdownHeight: 42 - property int fontHeaderSize: 16 * scaleRatio - property int fontItemSize: 14 * scaleRatio + property int fontHeaderSize: 16 + property int fontItemSize: 14 property string colorBorder: MoneroComponents.Style.inputBorderColorInActive property string colorHeaderBackground: "transparent" property bool headerBorder: true @@ -94,7 +94,7 @@ Item { id: firstColText anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - anchors.leftMargin: 12 * scaleRatio + anchors.leftMargin: 12 elide: Text.ElideRight font.family: MoneroComponents.Style.fontRegular.name font.bold: dropdown.headerFontBold @@ -107,7 +107,7 @@ Item { anchors.top: parent.top anchors.bottom: parent.bottom anchors.right: parent.right - width: 32 * scaleRatio + width: 32 Image { id: dropdownIcon @@ -120,7 +120,7 @@ Item { source: dropdownIcon anchors.fill: dropdownIcon color: MoneroComponents.Style.defaultFontColor - rotation: dropdown.expanded ? 180 * scaleRatio : 0 + rotation: dropdown.expanded ? 180 : 0 opacity: 1 } } @@ -146,14 +146,14 @@ Item { Rectangle { anchors.left: parent.left anchors.top: parent.top - width: 3 * scaleRatio; height: 3 * scaleRatio + width: 3; height: 3 color: dropdown.pressedColor } Rectangle { anchors.right: parent.right anchors.top: parent.top - width: 3 * scaleRatio; height: 3 * scaleRatio + width: 3; height: 3 color: dropdown.pressedColor } @@ -186,7 +186,7 @@ Item { delegate: Rectangle { anchors.left: parent.left anchors.right: parent.right - height: (dropdown.dropdownHeight * 0.75) * scaleRatio + height: (dropdown.dropdownHeight * 0.75) //radius: index === repeater.count - 1 ? 4 : 0 color: itemArea.containsMouse || index === columnid.currentIndex || itemArea.containsMouse ? dropdown.releasedColor : dropdown.pressedColor @@ -195,7 +195,7 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.right: col2Text.left - anchors.leftMargin: 12 * scaleRatio + anchors.leftMargin: 12 anchors.rightMargin: 0 font.family: MoneroComponents.Style.fontRegular.name font.bold: true @@ -208,9 +208,9 @@ Item { id: col2Text anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - anchors.rightMargin: 45 * scaleRatio + anchors.rightMargin: 45 font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 color: "#FFFFFF" text: "" } @@ -218,14 +218,14 @@ Item { Rectangle { anchors.left: parent.left anchors.top: parent.top - width: 3 * scaleRatio; height: 3 * scaleRatio + width: 3; height: 3 color: parent.color } Rectangle { anchors.right: parent.right anchors.top: parent.top - width: 3 * scaleRatio; height: 3 * scaleRatio + width: 3; height: 3 color: parent.color } diff --git a/components/TextPlain.qml b/components/TextPlain.qml index 2bc05042..a737aa2f 100644 --- a/components/TextPlain.qml +++ b/components/TextPlain.qml @@ -14,7 +14,7 @@ Text { property string themeTransitionWhiteColor: "" font.family: MoneroComponents.Style.fontMedium.name font.bold: false - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 textFormat: Text.PlainText MoneroEffects.ColorTransition { diff --git a/components/TextPlainArea.qml b/components/TextPlainArea.qml index 700e674f..648662b2 100644 --- a/components/TextPlainArea.qml +++ b/components/TextPlainArea.qml @@ -10,7 +10,7 @@ TextArea { property string colorBlackTheme: "" color: MoneroComponents.Style.defaultFontColor font.family: MoneroComponents.Style.fontRegular.name - font.pixelSize: 14 * scaleRatio + font.pixelSize: 14 selectByMouse: false wrapMode: Text.WordWrap; textMargin: 0 diff --git a/components/TitleBar.qml b/components/TitleBar.qml index e48feae8..feccdeb5 100644 --- a/components/TitleBar.qml +++ b/components/TitleBar.qml @@ -46,7 +46,7 @@ Rectangle { height: { if(!persistentSettings.customDecorations || isMobile) return 0; - return 50 * scaleRatio; + return 50; } z: 1 @@ -132,7 +132,7 @@ Rectangle { Text { text: FontAwesome.globe font.family: FontAwesome.fontFamily - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 color: MoneroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter @@ -158,7 +158,7 @@ Rectangle { Text { text: MoneroComponents.Style.blackTheme ? FontAwesome.lightbulbO : FontAwesome.moonO font.family: FontAwesome.fontFamily - font.pixelSize: 16 * scaleRatio + font.pixelSize: 16 color: MoneroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter diff --git a/components/WarningBox.qml b/components/WarningBox.qml index 9c7a1a91..91f29bed 100644 --- a/components/WarningBox.qml +++ b/components/WarningBox.qml @@ -8,7 +8,7 @@ Rectangle { id: root property alias text: content.text property alias textColor: content.color - property int fontSize: 15 * scaleRatio + property int fontSize: 15 Layout.fillWidth: true Layout.preferredHeight: warningLayout.height @@ -28,12 +28,12 @@ Rectangle { Image { Layout.alignment: Qt.AlignVCenter - Layout.preferredHeight: 33 * scaleRatio - Layout.preferredWidth: 33 * scaleRatio - Layout.rightMargin: 12 * scaleRatio - Layout.leftMargin: 18 * scaleRatio - Layout.topMargin: 12 * scaleRatio - Layout.bottomMargin: 12 * scaleRatio + Layout.preferredHeight: 33 + Layout.preferredWidth: 33 + Layout.rightMargin: 12 + Layout.leftMargin: 18 + Layout.topMargin: 12 + Layout.bottomMargin: 12 source: "qrc:///images/warning.png" } @@ -48,10 +48,10 @@ Rectangle { textFormat: Text.RichText wrapMode: Text.WordWrap textMargin: 0 - leftPadding: 4 * scaleRatio - rightPadding: 18 * scaleRatio - topPadding: 10 * scaleRatio - bottomPadding: 10 * scaleRatio + leftPadding: 4 + rightPadding: 18 + topPadding: 10 + bottomPadding: 10 readOnly: true onLinkActivated: root.linkActivated(); |
