Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

Merge pull request #2069

Browse Source 
62285b0 Remove scaleRatio (xmrdsc)
This commit is contained in:
luigi1111
2019-04-25 15:27:19 -05:00
parent 5887f87677 62285b01dc
commit b0ba2379f4
80 changed files with 1070 additions and 1075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pages/settings/Navbar.qml
View File

@@ -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 {

84
pages/settings/SettingsInfo.qml
View File

@@ -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"
}
}

22
pages/settings/SettingsLayout.qml
View File

@@ -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

32
pages/settings/SettingsLog.qml
View File

@@ -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)

76
pages/settings/SettingsNode.qml
View File

@@ -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")

72
pages/settings/SettingsWallet.qml
View File

@@ -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
}
}
}