Remove scaleRatio

This commit is contained in:
dsc
2019-04-25 21:09:23 +02:00
parent e1c429110f
commit 62285b01dc
80 changed files with 1070 additions and 1075 deletions

View File

@@ -79,7 +79,7 @@ ColumnLayout {
progressText.text = passwordStrengthText + strengthString + translationManager.emptyString;
}
spacing: 20 * scaleRatio
spacing: 20
WizardHeader{
title: qsTr("Give your wallet a password") + translationManager.emptyString
@@ -100,21 +100,21 @@ ColumnLayout {
anchors.top: parent.top
anchors.topMargin: 6
font.family: MoneroComponents.Style.fontMedium.name
font.pixelSize: 14 * scaleRatio
font.pixelSize: 14
font.bold: false
color: MoneroComponents.Style.defaultFontColor
text: root.passwordStrengthText + '-'
height: 18 * scaleRatio
height: 18
passwordCharacter: "*"
}
TextInput {
id: progressTextValue
font.family: MoneroComponents.Style.fontMedium.name
font.pixelSize: 13 * scaleRatio
font.pixelSize: 13
font.bold: true
color: MoneroComponents.Style.defaultFontColor
height: 18 * scaleRatio
height: 18
passwordCharacter: "*"
}
@@ -123,7 +123,7 @@ ColumnLayout {
Layout.fillWidth: true
Layout.preferredHeight: 8
radius: 8 * scaleRatio
radius: 8
color: MoneroComponents.Style.progressBarBackgroundColor
Rectangle {
@@ -132,7 +132,7 @@ ColumnLayout {
anchors.bottom: parent.bottom
anchors.left: parent.left
height: bar.height
property int maxWidth: bar.width * scaleRatio
property int maxWidth: bar.width
width: (maxWidth * root.passwordFill) / 100
radius: 8
color: MoneroComponents.Style.orange
@@ -142,20 +142,20 @@ ColumnLayout {
color: MoneroComponents.Style.defaultFontColor
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.leftMargin: 8 * scaleRatio
anchors.leftMargin: 8
}
}
}
ColumnLayout {
spacing: 4 * scaleRatio
spacing: 4
Layout.fillWidth: true
Label {
text: qsTr("Password") + translationManager.emptyString
Layout.fillWidth: true
font.pixelSize: 14 * scaleRatio
font.pixelSize: 14
font.family: MoneroComponents.Style.fontLight.name
color: MoneroComponents.Style.defaultFontColor
@@ -164,12 +164,12 @@ ColumnLayout {
TextField {
id: passwordInput
Layout.topMargin: 6 * scaleRatio
Layout.topMargin: 6
Layout.fillWidth: true
bottomPadding: 10 * scaleRatio
leftPadding: 10 * scaleRatio
topPadding: 10 * scaleRatio
bottomPadding: 10
leftPadding: 10
topPadding: 10
horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter
@@ -177,7 +177,7 @@ ColumnLayout {
KeyNavigation.tab: passwordInputConfirm
font.family: MoneroComponents.Style.fontLight.name
font.pixelSize: 15 * scaleRatio
font.pixelSize: 15
color: MoneroComponents.Style.defaultFontColor
selectionColor: MoneroComponents.Style.textSelectionColor
selectedTextColor: MoneroComponents.Style.textSelectedColor
@@ -212,7 +212,7 @@ ColumnLayout {
text: qsTr("Password (confirm)") + translationManager.emptyString
Layout.fillWidth: true
font.pixelSize: 14 * scaleRatio
font.pixelSize: 14
font.family: MoneroComponents.Style.fontLight.name
color: MoneroComponents.Style.defaultFontColor
@@ -221,12 +221,12 @@ ColumnLayout {
TextField {
id : passwordInputConfirm
Layout.topMargin: 6 * scaleRatio
Layout.topMargin: 6
Layout.fillWidth: true
bottomPadding: 10 * scaleRatio
leftPadding: 10 * scaleRatio
topPadding: 10 * scaleRatio
bottomPadding: 10
leftPadding: 10
topPadding: 10
horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter
@@ -234,7 +234,7 @@ ColumnLayout {
KeyNavigation.tab: passwordInputConfirm
font.family: MoneroComponents.Style.fontLight.name
font.pixelSize: 15 * scaleRatio
font.pixelSize: 15
color: MoneroComponents.Style.defaultFontColor
selectionColor: MoneroComponents.Style.textSelectionColor
selectedTextColor: MoneroComponents.Style.textSelectedColor

View File

@@ -76,8 +76,8 @@ Rectangle {
property var m_wallet;
property alias wizardState: wizardStateView.state
property alias wizardStatePrevious: wizardStateView.previousView
property int wizardSubViewWidth: 780 * scaleRatio
property int wizardSubViewTopMargin: persistentSettings.customDecorations ? 90 * scaleRatio : 32 * scaleRatio
property int wizardSubViewWidth: 780
property int wizardSubViewTopMargin: persistentSettings.customDecorations ? 90 : 32
property bool skipModeSelection: false
// wallet variables

View File

@@ -68,7 +68,7 @@ Rectangle {
Layout.topMargin: wizardController.wizardSubViewTopMargin
Layout.maximumWidth: wizardController.wizardSubViewWidth
Layout.alignment: Qt.AlignHCenter
spacing: 20 * scaleRatio
spacing: 20
WizardHeader {
title: qsTr("Create a new wallet") + translationManager.emptyString
@@ -82,13 +82,13 @@ Rectangle {
ColumnLayout {
spacing: 0
Layout.topMargin: 10 * scaleRatio
Layout.topMargin: 10
Layout.fillWidth: true
MoneroComponents.RadioButton {
id: newDeviceWallet
text: qsTr("Create a new wallet from device.") + translationManager.emptyString
fontSize: 16 * scaleRatio
fontSize: 16
checked: true
onClicked: {
checked = true;
@@ -99,9 +99,9 @@ Rectangle {
MoneroComponents.RadioButton {
id: restoreDeviceWallet
Layout.topMargin: 10 * scaleRatio
Layout.topMargin: 10
text: qsTr("Restore a wallet from device. Use this if you used your hardware wallet before.") + translationManager.emptyString
fontSize: 16 * scaleRatio
fontSize: 16
checked: false
onClicked: {
checked = true;
@@ -112,18 +112,18 @@ Rectangle {
}
ColumnLayout {
Layout.topMargin: 10 * scaleRatio
Layout.topMargin: 10
Layout.fillWidth: true
spacing: 20 * scaleRatio
spacing: 20
MoneroComponents.LineEdit {
id: restoreHeight
visible: !newDeviceWallet.checked
Layout.fillWidth: true
labelText: qsTr("Wallet creation date as `YYYY-MM-DD` or restore height") + translationManager.emptyString
labelFontSize: 14 * scaleRatio
placeholderFontSize: 16 * scaleRatio
labelFontSize: 14
placeholderFontSize: 16
placeholderText: qsTr("Restore height") + translationManager.emptyString
validator: RegExpValidator {
regExp: /^(\d+|\d{4}-\d{2}-\d{2})$/
@@ -136,9 +136,9 @@ Rectangle {
Layout.fillWidth: true
labelText: qsTr("Subaddress lookahead (optional)") + translationManager.emptyString
labelFontSize: 14 * scaleRatio
labelFontSize: 14
placeholderText: "<major>:<minor>"
placeholderFontSize: 16 * scaleRatio
placeholderFontSize: 16
validator: RegExpValidator { regExp: /(\d+):(\d+)?$/ }
}
}
@@ -146,7 +146,7 @@ Rectangle {
ColumnLayout {
spacing: 0
Layout.topMargin: 10 * scaleRatio
Layout.topMargin: 10
Layout.fillWidth: true
z: 3
@@ -155,7 +155,7 @@ Rectangle {
id: deviceNameDropdown
dataModel: deviceNameModel
Layout.fillWidth: true
Layout.topMargin: 6 * scaleRatio
Layout.topMargin: 6
}
}
}
@@ -167,7 +167,7 @@ Rectangle {
Layout.fillWidth: true
font.family: MoneroComponents.Style.fontRegular.name
color: MoneroComponents.Style.errorColor
font.pixelSize: 16 * scaleRatio
font.pixelSize: 16
selectionColor: MoneroComponents.Style.textSelectionColor
selectedTextColor: MoneroComponents.Style.textSelectedColor

View File

@@ -54,7 +54,7 @@ Rectangle {
Layout.topMargin: wizardController.wizardSubViewTopMargin
Layout.maximumWidth: wizardController.wizardSubViewWidth
Layout.alignment: Qt.AlignHCenter
spacing: 20 * scaleRatio
spacing: 20
WizardHeader {
title: qsTr("Create a new wallet") + translationManager.emptyString
@@ -68,26 +68,26 @@ Rectangle {
ColumnLayout {
spacing: 0
Layout.topMargin: 10 * scaleRatio
Layout.topMargin: 10
Layout.fillWidth: true
MoneroComponents.LineEditMulti {
id: seed
spacing: 0
inputPaddingLeft: 16 * scaleRatio
inputPaddingRight: 16 * scaleRatio
inputPaddingTop: 20 * scaleRatio
inputPaddingBottom: 20 * scaleRatio
inputPaddingLeft: 16
inputPaddingRight: 16
inputPaddingTop: 20
inputPaddingBottom: 20
inputRadius: 0
fontSize: 18 * scaleRatio
fontSize: 18
fontBold: true
wrapMode: Text.WordWrap
backgroundColor: "red"
addressValidation: false
labelText: qsTr("Mnemonic seed") + translationManager.emptyString
labelFontSize: 14 * scaleRatio
labelFontSize: 14
copyButton: false
readOnly: true

View File

@@ -51,7 +51,7 @@ Rectangle {
Layout.topMargin: wizardController.wizardSubViewTopMargin
Layout.maximumWidth: wizardController.wizardSubViewWidth
Layout.alignment: Qt.AlignHCenter
spacing: 0 * scaleRatio
spacing: 0
WizardAskPassword {
id: passwordFields

View File

@@ -51,7 +51,7 @@ Rectangle {
Layout.topMargin: wizardController.wizardSubViewTopMargin
Layout.maximumWidth: wizardController.wizardSubViewWidth
Layout.alignment: Qt.AlignHCenter
spacing: 20 * scaleRatio
spacing: 20
WizardHeader {
title: qsTr("Daemon settings") + translationManager.emptyString

View File

@@ -52,7 +52,7 @@ Rectangle {
Layout.topMargin: wizardController.wizardSubViewTopMargin
Layout.maximumWidth: wizardController.wizardSubViewWidth
Layout.alignment: Qt.AlignHCenter
spacing: 20 * scaleRatio
spacing: 20
WizardHeader {
title: qsTr("You're all set up!") + translationManager.emptyString
@@ -62,7 +62,7 @@ Rectangle {
WizardSummary {}
WizardNav {
Layout.topMargin: 24 * scaleRatio
Layout.topMargin: 24
btnNextText: qsTr("Open wallet") + translationManager.emptyString
progressSteps: 4
progress: 4

View File

@@ -38,7 +38,7 @@ ColumnLayout {
Layout.fillWidth: true
Layout.maximumWidth: wizardController.wizardSubViewWidth
Layout.alignment: Qt.AlignHCenter
spacing: 10 * scaleRatio
spacing: 10
function save(){
persistentSettings.useRemoteNode = remoteNode.checked
@@ -50,7 +50,7 @@ ColumnLayout {
id: localNode
Layout.fillWidth: true
text: qsTr("Start a node automatically in background (recommended)") + translationManager.emptyString
fontSize: 16 * scaleRatio
fontSize: 16
checked: !appWindow.persistentSettings.useRemoteNode && !isAndroid && !isIOS
visible: !isAndroid && !isIOS
onClicked: {
@@ -62,9 +62,9 @@ ColumnLayout {
ColumnLayout {
id: blockchainFolderRow
visible: localNode.checked
spacing: 20 * scaleRatio
spacing: 20
Layout.topMargin: 8 * scaleRatio
Layout.topMargin: 8
Layout.fillWidth: true
MoneroComponents.LineEdit {
@@ -73,9 +73,9 @@ ColumnLayout {
readOnly: true
labelText: qsTr("Blockchain location (optional)") + translationManager.emptyString
labelFontSize: 14 * scaleRatio
labelFontSize: 14
placeholderText: qsTr("Default") + translationManager.emptyString
placeholderFontSize: 15 * scaleRatio
placeholderFontSize: 15
text: persistentSettings.blockchainDataDir
inlineButton.small: true
inlineButtonText: qsTr("Browse") + translationManager.emptyString
@@ -88,20 +88,20 @@ ColumnLayout {
}
ColumnLayout{
Layout.topMargin: 6 * scaleRatio
Layout.topMargin: 6
spacing: 0
TextArea {
text: qsTr("Bootstrap node") + translationManager.emptyString
Layout.topMargin: 10 * scaleRatio
Layout.topMargin: 10
Layout.fillWidth: true
font.family: MoneroComponents.Style.fontRegular.name
color: MoneroComponents.Style.defaultFontColor
font.pixelSize: {
if(wizardController.layoutScale === 2 ){
return 22 * scaleRatio;
return 22;
} else {
return 16 * scaleRatio;
return 16;
}
}
@@ -119,7 +119,7 @@ ColumnLayout {
TextArea {
text: qsTr("Additionally, you may specify a bootstrap node to use Monero immediately.") + translationManager.emptyString
Layout.topMargin: 4 * scaleRatio
Layout.topMargin: 4
Layout.fillWidth: true
font.family: MoneroComponents.Style.fontRegular.name
@@ -127,9 +127,9 @@ ColumnLayout {
font.pixelSize: {
if(wizardController.layoutScale === 2 ){
return 16 * scaleRatio;
return 16;
} else {
return 14 * scaleRatio;
return 14;
}
}
@@ -152,7 +152,7 @@ ColumnLayout {
MoneroComponents.RemoteNodeEdit {
id: bootstrapNodeEdit
Layout.minimumWidth: 300 * scaleRatio
Layout.minimumWidth: 300
//labelText: qsTr("Bootstrap node (leave blank if not wanted)") + translationManager.emptyString
daemonAddrText: persistentSettings.bootstrapNodeAddress.split(":")[0].trim()
@@ -171,9 +171,9 @@ ColumnLayout {
MoneroComponents.RadioButton {
id: remoteNode
Layout.fillWidth: true
Layout.topMargin: 8 * scaleRatio
Layout.topMargin: 8
text: qsTr("Connect to a remote node") + translationManager.emptyString
fontSize: 16 * scaleRatio
fontSize: 16
checked: appWindow.persistentSettings.useRemoteNode
onClicked: {
checked = true
@@ -183,9 +183,9 @@ ColumnLayout {
ColumnLayout {
visible: remoteNode.checked
spacing: 0 * scaleRatio
spacing: 0
Layout.topMargin: 8 * scaleRatio
Layout.topMargin: 8
Layout.fillWidth: true
MoneroComponents.RemoteNodeEdit {

View File

@@ -38,7 +38,7 @@ import QtQuick.Controls 2.0
ColumnLayout {
property string title: ""
property string subtitle: ""
spacing: 4 * scaleRatio
spacing: 4
Layout.maximumWidth: wizardController.wizardSubViewWidth
TextArea {
@@ -49,9 +49,9 @@ ColumnLayout {
opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8
font.pixelSize: {
if(wizardController.layoutScale === 2 ){
return 34 * scaleRatio;
return 34;
} else {
return 28 * scaleRatio;
return 28;
}
}
@@ -78,9 +78,9 @@ ColumnLayout {
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: {
if(wizardController.layoutScale === 2 ){
return 16 * scaleRatio;
return 16;
} else {
return 14 * scaleRatio;
return 14;
}
}

View File

@@ -46,17 +46,17 @@ Rectangle {
Layout.fillWidth: true
anchors.horizontalCenter: parent.horizontalCenter;
spacing: 10 * scaleRatio
spacing: 10
ColumnLayout {
Layout.fillWidth: true
Layout.topMargin: wizardController.wizardSubViewTopMargin
Layout.maximumWidth: wizardController.wizardSubViewWidth
Layout.alignment: Qt.AlignHCenter
spacing: 0 * scaleRatio
spacing: 0
WizardHeader {
Layout.bottomMargin: 20 * scaleRatio
Layout.bottomMargin: 20
title: qsTr("Welcome to Monero.") + translationManager.emptyString
subtitle: ""
}
@@ -75,8 +75,8 @@ Rectangle {
Rectangle {
Layout.preferredHeight: 1
Layout.topMargin: 3 * scaleRatio
Layout.bottomMargin: 3 * scaleRatio
Layout.topMargin: 3
Layout.bottomMargin: 3
Layout.fillWidth: true
color: MoneroComponents.Style.dividerColor
opacity: MoneroComponents.Style.dividerOpacity
@@ -95,8 +95,8 @@ Rectangle {
Rectangle {
Layout.preferredHeight: 1
Layout.topMargin: 3 * scaleRatio
Layout.bottomMargin: 3 * scaleRatio
Layout.topMargin: 3
Layout.bottomMargin: 3
Layout.fillWidth: true
color: MoneroComponents.Style.dividerColor
opacity: MoneroComponents.Style.dividerOpacity
@@ -114,8 +114,8 @@ Rectangle {
Rectangle {
Layout.preferredHeight: 1
Layout.topMargin: 3 * scaleRatio
Layout.bottomMargin: 3 * scaleRatio
Layout.topMargin: 3
Layout.bottomMargin: 3
Layout.fillWidth: true
color: MoneroComponents.Style.dividerColor
opacity: MoneroComponents.Style.dividerOpacity
@@ -134,8 +134,8 @@ Rectangle {
RowLayout {
Layout.fillWidth: true
Layout.topMargin: 16 * scaleRatio
spacing: 20 * scaleRatio
Layout.topMargin: 16
spacing: 20
MoneroComponents.StandardButton {
small: true
@@ -159,9 +159,9 @@ Rectangle {
MoneroComponents.CheckBox2 {
id: showAdvancedCheckbox
Layout.topMargin: 30 * scaleRatio
Layout.topMargin: 30
Layout.fillWidth: true
fontSize: 15 * scaleRatio
fontSize: 15
checked: false
text: qsTr("Advanced options") + translationManager.emptyString
visible: appWindow.walletMode >= 2
@@ -203,8 +203,8 @@ Rectangle {
Layout.fillWidth: true
labelText: qsTr("Number of KDF rounds:") + translationManager.emptyString
labelFontSize: 14 * scaleRatio
placeholderFontSize: 16 * scaleRatio
labelFontSize: 14
placeholderFontSize: 16
placeholderText: "0"
validator: IntValidator { bottom: 1 }
text: persistentSettings.kdfRounds ? persistentSettings.kdfRounds : "1"

View File

@@ -65,8 +65,8 @@ Rectangle {
ColumnLayout {
anchors.top: parent.top
anchors.topMargin: persistentSettings.customDecorations ? 90 * scaleRatio : 32 * scaleRatio
width: parent.width - 100 * scaleRatio
anchors.topMargin: persistentSettings.customDecorations ? 90 : 32
width: parent.width - 100
anchors.horizontalCenter: parent.horizontalCenter;
TextArea {
@@ -76,9 +76,9 @@ Rectangle {
color: MoneroComponents.Style.defaultFontColor
font.pixelSize: {
if(langScreen.layoutScale === 2 ){
return 34 * scaleRatio;
return 34;
} else {
return 28 * scaleRatio;
return 28;
}
}
@@ -104,9 +104,9 @@ Rectangle {
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: {
if(langScreen.layoutScale === 2 ){
return 16 * scaleRatio;
return 16;
} else {
return 14 * scaleRatio;
return 14;
}
}
@@ -123,11 +123,11 @@ Rectangle {
Flow {
id: flow
height: 800 * scaleRatio
height: 800
Layout.fillWidth: true
Layout.topMargin: 20 * scaleRatio
Layout.topMargin: 20
spacing: 5 * scaleRatio
spacing: 5
Repeater {
model: langModel
@@ -136,25 +136,25 @@ Rectangle {
color: "transparent"
width: {
var minimumWidth = img.width + langRect.width;
if(minimumWidth < 200 * scaleRatio) return 200 * scaleRatio;
if(minimumWidth < 200) return 200;
return minimumWidth;
}
height: 48 * scaleRatio
height: 48
Rectangle {
id: img
anchors.top: parent.top
color: "transparent"
width: 32 * scaleRatio
width: 32
height: parent.height
Image {
source: flag
mipmap: true
smooth: true
width: 32 * scaleRatio
height: 32 * scaleRatio
width: 32
height: 32
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
@@ -166,12 +166,12 @@ Rectangle {
anchors.left: img.right
color: "transparent"
height: parent.height
width: langText.width + 22 * scaleRatio
width: langText.width + 22
MoneroComponents.TextPlain {
id: langText
font.bold: true
font.pixelSize: 14 * scaleRatio
font.pixelSize: 14
color: MoneroComponents.Style.defaultFontColor
text: display_name
anchors.verticalCenter: parent.verticalCenter
@@ -211,8 +211,8 @@ Rectangle {
RowLayout {
Layout.fillWidth: true
Layout.topMargin: 32 * scaleRatio
spacing: 20 * scaleRatio
Layout.topMargin: 32
spacing: 20
MoneroComponents.StandardButton {
small: true

View File

@@ -46,7 +46,7 @@ Rectangle {
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
spacing: 30 * scaleRatio
spacing: 30
Rectangle {
// some margins for the titlebar
@@ -66,7 +66,7 @@ Rectangle {
font.family: MoneroComponents.Style.fontRegular.name
font.bold: true
font.pixelSize: 18 * scaleRatio
font.pixelSize: 18
horizontalAlignment: TextInput.AlignHCenter
selectByMouse: false
wrapMode: Text.WordWrap
@@ -110,10 +110,10 @@ Rectangle {
visible: !globe.small
anchors.left: parent.left
anchors.top: parent.top
anchors.leftMargin: 117 * scaleRatio
anchors.topMargin: 71 * scaleRatio
width: 36 * scaleRatio
height: 40 * scaleRatio
anchors.leftMargin: 117
anchors.topMargin: 71
width: 36
height: 40
color: "transparent"
MouseArea {
@@ -150,13 +150,13 @@ Rectangle {
opacity: 0
columns: isMobile ? 1 : 2
anchors.horizontalCenter: parent.horizontalCenter
Layout.topMargin: 20 * scaleRatio
Layout.topMargin: 20
Layout.fillWidth: true
columnSpacing: 20 * scaleRatio
columnSpacing: 20
MoneroComponents.StandardButton {
id: idChangeLang
Layout.minimumWidth: 150 * scaleRatio
Layout.minimumWidth: 150
text: "Language"
onClicked: {
@@ -166,7 +166,7 @@ Rectangle {
MoneroComponents.StandardButton {
id: btnContinue
Layout.minimumWidth: 150 * scaleRatio
Layout.minimumWidth: 150
text: "Continue"
onClicked: {
@@ -191,7 +191,7 @@ Rectangle {
opacity: 0
anchors.horizontalCenter: parent.horizontalCenter
font.bold: true
font.pixelSize: 12 * scaleRatio
font.pixelSize: 12
font.family: MoneroComponents.Style.fontRegular.name
color: MoneroComponents.Style.defaultFontColor
text: Version.GUI_VERSION + " (Qt " + qtRuntimeVersion + ")"

View File

@@ -37,16 +37,16 @@ import "../components" as MoneroComponents
RowLayout {
id: rowlayout
Layout.fillWidth: true
Layout.bottomMargin: 10 * scaleRatio
Layout.bottomMargin: 10
property alias imageIcon: icon.source
property alias headerText: header.text
property alias bodyText: body.text
signal menuClicked();
spacing: 10 * scaleRatio
spacing: 10
Item {
Layout.preferredWidth: 70 * scaleRatio
Layout.preferredHeight: 70 * scaleRatio
Layout.preferredWidth: 70
Layout.preferredHeight: 70
Image {
id: icon
@@ -93,9 +93,9 @@ RowLayout {
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: {
if(wizardController.layoutScale === 2 ){
return 22 * scaleRatio;
return 22;
} else {
return 16 * scaleRatio;
return 16;
}
}
@@ -115,12 +115,12 @@ RowLayout {
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: {
if(wizardController.layoutScale === 2 ){
return 16 * scaleRatio;
return 16;
} else {
return 14 * scaleRatio;
return 14;
}
}
topPadding: 4 * scaleRatio
topPadding: 4
wrapMode: Text.WordWrap
themeTransition: false

View File

@@ -46,14 +46,14 @@ Rectangle {
Layout.fillWidth: true
anchors.horizontalCenter: parent.horizontalCenter;
spacing: 10 * scaleRatio
spacing: 10
ColumnLayout {
Layout.fillWidth: true
Layout.maximumWidth: wizardController.wizardSubViewWidth
Layout.topMargin: wizardController.wizardSubViewTopMargin
Layout.alignment: Qt.AlignHCenter
spacing: 0 * scaleRatio
spacing: 0
WizardHeader {
title: qsTr("About the bootstrap mode") + translationManager.emptyString
@@ -61,47 +61,47 @@ Rectangle {
}
ColumnLayout {
spacing: 20 * scaleRatio
spacing: 20
Layout.topMargin: 10 * scaleRatio
Layout.topMargin: 10
Layout.fillWidth: true
MoneroComponents.TextPlain {
text: qsTr("This mode will use a remote node whilst also syncing the blockchain. This is different from the first menu option (Simple mode), since it will only use the remote node until the blockchain is fully synced locally. It is a reasonable tradeoff for most people who care about privacy but also want the convenience of an automatic fallback option.") + translationManager.emptyString
wrapMode: Text.Wrap
Layout.topMargin: 14 * scaleRatio
Layout.topMargin: 14
Layout.fillWidth: true
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 16 * scaleRatio
font.pixelSize: 16
color: MoneroComponents.Style.lightGreyFontColor
}
MoneroComponents.TextPlain {
text: qsTr("Temporary use of remote nodes is useful in order to use Monero immediately (hence the name <i>bootstrap</i>), however be aware that when using remote nodes (including with the bootstrap setting), nodes could track your IP address, track your \"restore height\" and associated block request data, and send you inaccurate information to learn more about transactions you make.") + translationManager.emptyString
wrapMode: Text.Wrap
Layout.topMargin: 8 * scaleRatio
Layout.topMargin: 8
Layout.fillWidth: true
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 16 * scaleRatio
font.pixelSize: 16
color: MoneroComponents.Style.lightGreyFontColor
}
MoneroComponents.WarningBox{
Layout.topMargin: 14 * scaleRatio
Layout.bottomMargin: 6 * scaleRatio
Layout.topMargin: 14
Layout.bottomMargin: 6
text: qsTr("Remain aware of these limitations. <b>Users who prioritize privacy and decentralization must use a full node instead</b>.") + translationManager.emptyString
}
MoneroComponents.TextPlain {
text: qsTr("For enhanced node performance you may specify your region:") + translationManager.emptyString
wrapMode: Text.Wrap
Layout.topMargin: 8 * scaleRatio
Layout.topMargin: 8
Layout.fillWidth: true
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 16 * scaleRatio
font.pixelSize: 16
color: MoneroComponents.Style.defaultFontColor
}
@@ -139,8 +139,8 @@ Rectangle {
MoneroComponents.CheckBox {
id: understoodCheckbox
Layout.topMargin: 20 * scaleRatio
fontSize: 16 * scaleRatio
Layout.topMargin: 20
fontSize: 16
text: qsTr("I understand the privacy implications of using a third-party server.") + translationManager.emptyString
onClicked: {
wizardModeBootstrapWarning.understood = !wizardModeBootstrapWarning.understood
@@ -148,7 +148,7 @@ Rectangle {
}
WizardNav {
Layout.topMargin: 4 * scaleRatio
Layout.topMargin: 4
btnNext.enabled: wizardModeBootstrapWarning.understood
progressSteps: 0

View File

@@ -46,14 +46,14 @@ Rectangle {
Layout.fillWidth: true
anchors.horizontalCenter: parent.horizontalCenter;
spacing: 10 * scaleRatio
spacing: 10
ColumnLayout {
Layout.fillWidth: true
Layout.maximumWidth: wizardController.wizardSubViewWidth
Layout.topMargin: wizardController.wizardSubViewTopMargin
Layout.alignment: Qt.AlignHCenter
spacing: 0 * scaleRatio
spacing: 0
WizardHeader {
title: qsTr("About the simple mode") + translationManager.emptyString
@@ -61,9 +61,9 @@ Rectangle {
}
ColumnLayout {
spacing: 20 * scaleRatio
spacing: 20
Layout.topMargin: 10 * scaleRatio
Layout.topMargin: 10
Layout.fillWidth: true
MoneroComponents.TextPlain {
@@ -71,11 +71,11 @@ Rectangle {
themeTransitionBlackColor: MoneroComponents.Style._b_lightGreyFontColor
themeTransitionWhiteColor: MoneroComponents.Style._w_lightGreyFontColor
wrapMode: Text.Wrap
Layout.topMargin: 14 * scaleRatio
Layout.topMargin: 14
Layout.fillWidth: true
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 16 * scaleRatio
font.pixelSize: 16
color: MoneroComponents.Style.lightGreyFontColor
}
@@ -84,28 +84,28 @@ Rectangle {
themeTransitionBlackColor: MoneroComponents.Style._b_lightGreyFontColor
themeTransitionWhiteColor: MoneroComponents.Style._w_lightGreyFontColor
wrapMode: Text.Wrap
Layout.topMargin: 8 * scaleRatio
Layout.topMargin: 8
Layout.fillWidth: true
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 16 * scaleRatio
font.pixelSize: 16
color: MoneroComponents.Style.lightGreyFontColor
}
MoneroComponents.WarningBox {
Layout.topMargin: 14 * scaleRatio
Layout.bottomMargin: 6 * scaleRatio
Layout.topMargin: 14
Layout.bottomMargin: 6
text: qsTr("Remain aware of these limitations. <b>Users who prioritize privacy and decentralization must use a full node instead</b>.") + translationManager.emptyString
}
MoneroComponents.TextPlain {
text: qsTr("For enhanced node performance you may specify your region:") + translationManager.emptyString
wrapMode: Text.Wrap
Layout.topMargin: 8 * scaleRatio
Layout.topMargin: 8
Layout.fillWidth: true
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 16 * scaleRatio
font.pixelSize: 16
color: MoneroComponents.Style.defaultFontColor
}
@@ -143,8 +143,8 @@ Rectangle {
MoneroComponents.CheckBox {
id: understoodCheckbox
Layout.topMargin: 20 * scaleRatio
fontSize: 16 * scaleRatio
Layout.topMargin: 20
fontSize: 16
text: qsTr("I understand the privacy implications of using a third-party server.") + translationManager.emptyString
onClicked: {
wizardModeRemoteNodeWarning.understood = !wizardModeRemoteNodeWarning.understood
@@ -152,7 +152,7 @@ Rectangle {
}
WizardNav {
Layout.topMargin: 4 * scaleRatio
Layout.topMargin: 4
btnNext.enabled: wizardModeRemoteNodeWarning.understood
progressSteps: 0

View File

@@ -46,14 +46,14 @@ Rectangle {
Layout.fillWidth: true
anchors.horizontalCenter: parent.horizontalCenter;
spacing: 10 * scaleRatio
spacing: 10
ColumnLayout {
Layout.fillWidth: true
Layout.maximumWidth: wizardController.wizardSubViewWidth
Layout.topMargin: wizardController.wizardSubViewTopMargin
Layout.alignment: Qt.AlignHCenter
spacing: 0 * scaleRatio
spacing: 0
WizardHeader {
title: qsTr("Mode selection.") + translationManager.emptyString
@@ -62,7 +62,7 @@ Rectangle {
WizardMenuItem {
opacity: appWindow.persistentSettings.nettype == 0 ? 1.0 : 0.5
Layout.topMargin: 20 * scaleRatio
Layout.topMargin: 20
headerText: qsTr("Simple mode") + translationManager.emptyString
bodyText: {
if(appWindow.persistentSettings.nettype == 0){
@@ -84,8 +84,8 @@ Rectangle {
Rectangle {
Layout.preferredHeight: 1
Layout.topMargin: 5 * scaleRatio
Layout.bottomMargin: 10 * scaleRatio
Layout.topMargin: 5
Layout.bottomMargin: 10
Layout.fillWidth: true
color: MoneroComponents.Style.dividerColor
opacity: MoneroComponents.Style.dividerOpacity
@@ -113,8 +113,8 @@ Rectangle {
Rectangle {
Layout.preferredHeight: 1
Layout.topMargin: 5 * scaleRatio
Layout.bottomMargin: 10 * scaleRatio
Layout.topMargin: 5
Layout.bottomMargin: 10
Layout.fillWidth: true
color: MoneroComponents.Style.dividerColor
opacity: MoneroComponents.Style.dividerOpacity
@@ -132,7 +132,7 @@ Rectangle {
}
WizardNav {
Layout.topMargin: 5 * scaleRatio
Layout.topMargin: 5
btnPrevText: qsTr("Change language") + translationManager.emptyString
btnNext.visible: false
progressSteps: 0

View File

@@ -42,8 +42,8 @@ GridLayout {
property alias btnNext: btnNext
property string btnPrevText: qsTr("Previous") + translationManager.emptyString
property string btnNextText: qsTr("Next") + translationManager.emptyString
Layout.topMargin: 20 * scaleRatio
Layout.preferredHeight: 70 * scaleRatio
Layout.topMargin: 20
Layout.preferredHeight: 70
Layout.preferredWidth: parent.width
columns: 3

View File

@@ -34,7 +34,7 @@ import "../components" as MoneroComponents
Rectangle {
property bool active: false
Layout.preferredWidth: 30 * scaleRatio
Layout.preferredWidth: 30
Layout.fillHeight: true
property string activeColor: MoneroComponents.Style.defaultFontColor
property string inactiveColor: MoneroComponents.Style.progressBarBackgroundColor
@@ -43,9 +43,9 @@ Rectangle {
Rectangle {
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
width: 10 * scaleRatio
height: 10 * scaleRatio
radius: 10 * scaleRatio
width: 10
height: 10
radius: 10
color: parent.active ? parent.activeColor : parent.inactiveColor
}
}

View File

@@ -67,7 +67,7 @@ Rectangle {
Layout.topMargin: wizardController.wizardSubViewTopMargin
Layout.maximumWidth: wizardController.wizardSubViewWidth
Layout.alignment: Qt.AlignHCenter
spacing: 20 * scaleRatio
spacing: 20
WizardHeader {
title: qsTr("Open a wallet from file") + translationManager.emptyString
@@ -75,7 +75,7 @@ Rectangle {
}
MoneroComponents.StandardButton {
Layout.topMargin: 20 * scaleRatio
Layout.topMargin: 20
id: btnNext
small: true
text: qsTr("Browse filesystem") + translationManager.emptyString
@@ -87,15 +87,15 @@ Rectangle {
GridLayout {
visible: folderModel.count > 0
Layout.topMargin: 30 * scaleRatio
Layout.topMargin: 30
Layout.fillWidth: true
columnSpacing: 20 * scaleRatio
columnSpacing: 20
columns: 2
MoneroComponents.TextPlain {
text: qsTr("Most recent wallets") + translationManager.emptyString
font.family: MoneroComponents.Style.fontLight.name
font.pixelSize: 16 * scaleRatio
font.pixelSize: 16
color: MoneroComponents.Style.defaultFontColor
Layout.fillWidth: true
}
@@ -107,14 +107,14 @@ Rectangle {
GridLayout {
visible: folderModel.count > 0
Layout.topMargin: 10 * scaleRatio
Layout.topMargin: 10
Layout.fillWidth: true
columnSpacing: 20 * scaleRatio
columnSpacing: 20
columns: 2
ListView {
id: recentList
property int itemHeight: 42 * scaleRatio
property int itemHeight: 42
property int maxItems: 7
clip: true
@@ -125,14 +125,14 @@ Rectangle {
delegate: Rectangle {
height: recentList.itemHeight
width: 200 * scaleRatio
width: 200
property string activeColor: "#26FFFFFF"
color: "transparent"
RowLayout {
height: recentList.itemHeight
width: parent.width
spacing: 10 * scaleRatio
spacing: 10
Rectangle {
Layout.preferredWidth: recentList.itemHeight
@@ -159,7 +159,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
font.family: MoneroComponents.Style.fontRegular.name
color: MoneroComponents.Style.defaultFontColor
font.pixelSize: 18 * scaleRatio
font.pixelSize: 18
selectionColor: MoneroComponents.Style.textSelectionColor
selectedTextColor: MoneroComponents.Style.textSelectedColor
@@ -219,9 +219,9 @@ Rectangle {
WizardNav {
Layout.topMargin: {
if(folderModel.count > 0){
return 40 * scaleRatio;
return 40;
} else {
return 20 * scaleRatio;
return 20;
}
}
progressEnabled: false

View File

@@ -99,7 +99,7 @@ Rectangle {
Layout.topMargin: wizardController.wizardSubViewTopMargin
Layout.maximumWidth: wizardController.wizardSubViewWidth
Layout.alignment: Qt.AlignHCenter
spacing: 20 * scaleRatio
spacing: 20
WizardHeader {
title: qsTr("Restore wallet") + translationManager.emptyString
@@ -150,14 +150,14 @@ Rectangle {
ColumnLayout {
// seed textarea
visible: wizardController.walletRestoreMode === 'seed'
Layout.preferredHeight: 100 * scaleRatio
Layout.preferredHeight: 100
Layout.fillWidth: true
Rectangle {
color: "transparent"
radius: 4
Layout.preferredHeight: 100 * scaleRatio
Layout.preferredHeight: 100
Layout.fillWidth: true
border.width: 1
@@ -175,14 +175,14 @@ Rectangle {
id: seedInput
property bool error: false
width: parent.width
height: 100 * scaleRatio
height: 100
color: MoneroComponents.Style.defaultFontColor
textMargin: 2 * scaleRatio
textMargin: 2
text: ""
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 16 * scaleRatio
font.pixelSize: 16
selectionColor: MoneroComponents.Style.textSelectionColor
selectedTextColor: MoneroComponents.Style.textSelectedColor
wrapMode: TextInput.Wrap
@@ -193,9 +193,9 @@ Rectangle {
id: memoTextPlaceholder
opacity: 0.35
anchors.fill:parent
font.pixelSize: 16 * scaleRatio
anchors.margins: 8 * scaleRatio
anchors.leftMargin: 10 * scaleRatio
font.pixelSize: 16
anchors.margins: 8
anchors.leftMargin: 10
font.family: MoneroComponents.Style.fontRegular.name
text: qsTr("Enter your 25 (or 24) word mnemonic seed") + translationManager.emptyString
color: MoneroComponents.Style.defaultFontColor
@@ -209,7 +209,7 @@ Rectangle {
id: addressLine
visible: wizardController.walletRestoreMode === 'keys'
Layout.fillWidth: true
placeholderFontSize: 16 * scaleRatio
placeholderFontSize: 16
placeholderText: qsTr("Account address (public)") + translationManager.emptyString
onTextUpdated: {
@@ -221,7 +221,7 @@ Rectangle {
id: viewKeyLine
visible: wizardController.walletRestoreMode === 'keys'
Layout.fillWidth: true
placeholderFontSize: 16 * scaleRatio
placeholderFontSize: 16
placeholderText: qsTr("View key (private)") + translationManager.emptyString
onTextUpdated: {
@@ -233,7 +233,7 @@ Rectangle {
id: spendKeyLine
visible: wizardController.walletRestoreMode === 'keys'
Layout.fillWidth: true
placeholderFontSize: 16 * scaleRatio
placeholderFontSize: 16
placeholderText: qsTr("Spend key (private)") + translationManager.emptyString
onTextUpdated: {
@@ -246,8 +246,8 @@ Rectangle {
id: restoreHeight
Layout.fillWidth: true
labelText: qsTr("Wallet creation date as `YYYY-MM-DD` or restore height") + translationManager.emptyString
labelFontSize: 14 * scaleRatio
placeholderFontSize: 16 * scaleRatio
labelFontSize: 14
placeholderFontSize: 16
placeholderText: qsTr("Restore height") + translationManager.emptyString
validator: RegExpValidator {
regExp: /^(\d+|\d{4}-\d{2}-\d{2})$/

View File

@@ -54,7 +54,7 @@ Rectangle {
Layout.topMargin: wizardController.wizardSubViewTopMargin
Layout.maximumWidth: wizardController.wizardSubViewWidth
Layout.alignment: Qt.AlignHCenter
spacing: 0 * scaleRatio
spacing: 0
WizardAskPassword {
id: passwordFields

View File

@@ -59,7 +59,7 @@ Rectangle {
Layout.topMargin: wizardController.wizardSubViewTopMargin
Layout.maximumWidth: wizardController.wizardSubViewWidth
Layout.alignment: Qt.AlignHCenter
spacing: 20 * scaleRatio
spacing: 20
WizardHeader {
title: qsTr("Daemon settings") + translationManager.emptyString

View File

@@ -52,7 +52,7 @@ Rectangle {
Layout.topMargin: wizardController.wizardSubViewTopMargin
Layout.maximumWidth: wizardController.wizardSubViewWidth
Layout.alignment: Qt.AlignHCenter
spacing: 20 * scaleRatio
spacing: 20
WizardHeader {
title: qsTr("You're all set up!") + translationManager.emptyString
@@ -62,7 +62,7 @@ Rectangle {
WizardSummary {}
WizardNav {
Layout.topMargin: 24 * scaleRatio
Layout.topMargin: 24
btnNextText: "Open wallet"
progressSteps: 4
progress: 4

View File

@@ -47,7 +47,7 @@ ColumnLayout {
Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: 20 * scaleRatio
Layout.preferredHeight: 20
color: "transparent"
MoneroComponents.TextBlock {
@@ -61,7 +61,7 @@ ColumnLayout {
Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: 20 * scaleRatio
Layout.preferredHeight: 20
color: "transparent"
MoneroComponents.TextBlock {
@@ -75,9 +75,9 @@ ColumnLayout {
}
Rectangle {
Layout.preferredHeight: 1 * scaleRatio
Layout.topMargin: 2 * scaleRatio
Layout.bottomMargin: 2 * scaleRatio
Layout.preferredHeight: 1
Layout.topMargin: 2
Layout.bottomMargin: 2
Layout.fillWidth: true
color: MoneroComponents.Style.dividerColor
opacity: MoneroComponents.Style.dividerOpacity

View File

@@ -40,7 +40,7 @@ GridLayout {
property alias walletName: walletName
property alias walletLocation: walletLocation
columnSpacing: 20 * scaleRatio
columnSpacing: 20
columns: 3
function verify() {
@@ -71,8 +71,8 @@ GridLayout {
}
labelText: qsTr("Wallet name") + translationManager.emptyString
labelFontSize: 14 * scaleRatio
placeholderFontSize: 16 * scaleRatio
labelFontSize: 14
placeholderFontSize: 16
placeholderText: "-"
text: defaultAccountName
@@ -85,9 +85,9 @@ GridLayout {
Layout.fillWidth: true
labelText: qsTr("Wallet location") + translationManager.emptyString
labelFontSize: 14 * scaleRatio
labelFontSize: 14
placeholderText: "..."
placeholderFontSize: 16 * scaleRatio
placeholderFontSize: 16
text: moneroAccountsDir + "/"
inlineButton.small: true
inlineButtonText: qsTr("Browse") + translationManager.emptyString