aboutsummaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorrating89us <45968869+rating89us@users.noreply.github.com>2021-06-09 05:42:43 +0200
committerrating89us <rating89us@rating89us.com>2021-06-11 17:13:52 +0200
commit52aef114fab755d2a58c19252cdc1bcbedd1c122 (patch)
tree78c30b3caf180a68652b0cf914ec722104a26625 /pages
parent7c379e2cdaafc0cd618dbaab466625aa76c918bf (diff)
downloadmonzero-gui-52aef114fab755d2a58c19252cdc1bcbedd1c122.tar.gz
monzero-gui-52aef114fab755d2a58c19252cdc1bcbedd1c122.tar.xz
monzero-gui-52aef114fab755d2a58c19252cdc1bcbedd1c122.zip
LineEdit: use ColumnLayout instead of Item (also used in LineEditMulti)
Diffstat (limited to 'pages')
-rw-r--r--pages/History.qml28
-rw-r--r--pages/Transfer.qml20
-rw-r--r--pages/settings/SettingsLog.qml3
3 files changed, 37 insertions, 14 deletions
diff --git a/pages/History.qml b/pages/History.qml
index 8711aca7..a7a56f92 100644
--- a/pages/History.qml
+++ b/pages/History.qml
@@ -171,19 +171,25 @@ Rectangle {
}
}
- MoneroComponents.InlineButton {
- Layout.topMargin: -8
+ Rectangle {
+ color: "transparent"
+ height: cleanButton.height
+ width: cleanButton.width
Layout.rightMargin: -8
Layout.leftMargin: -2
- buttonColor: "transparent"
- fontFamily: FontAwesome.fontFamilySolid
- fontStyleName: "Solid"
- fontPixelSize: 18
- text: FontAwesome.times
- tooltip: qsTr("Clean") + translationManager.emptyString
- tooltipLeft: true
- visible: searchInput.text != ""
- onClicked: searchInput.text = ""
+
+ MoneroComponents.InlineButton {
+ id: cleanButton
+ buttonColor: "transparent"
+ fontFamily: FontAwesome.fontFamilySolid
+ fontStyleName: "Solid"
+ fontPixelSize: 18
+ text: FontAwesome.times
+ tooltip: qsTr("Clean") + translationManager.emptyString
+ tooltipLeft: true
+ visible: searchInput.text != ""
+ onClicked: searchInput.text = ""
+ }
}
}
}
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index bf56ed24..a2c5a1ae 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -468,10 +468,14 @@ Rectangle {
Layout.bottomMargin: recipientLayout.rowSpacing / 2
Layout.rightMargin: recipientLayout.colSpacing / 2
Layout.preferredWidth: 125
+ Layout.maximumWidth: 125
borderDisabled: true
fontFamily: MoneroComponents.Style.fontMonoRegular.name
fontSize: 14
- inputPadding: 0
+ inputPaddingLeft: 0
+ inputPaddingRight: 0
+ inputPaddingTop: 0
+ inputPaddingBottom: 0
placeholderFontFamily: MoneroComponents.Style.fontMonoRegular.name
placeholderFontSize: 14
placeholderLeftMargin: 0
@@ -586,11 +590,15 @@ Rectangle {
Layout.column: 1
Layout.row: 0
Layout.preferredWidth: recipientLayout.secondRowWidth
+ Layout.maximumWidth: recipientLayout.secondRowWidth
borderDisabled: true
fontFamily: MoneroComponents.Style.fontMonoRegular.name
fontSize: 14
inputHeight: 30
- inputPadding: 0
+ inputPaddingLeft: 0
+ inputPaddingRight: 0
+ inputPaddingTop: 0
+ inputPaddingBottom: 0
readOnly: true
text: Utils.removeTrailingZeros(walletManager.displayAmount(recipientModel.getAmountTotal()))
visible: recipientModel.count > 1
@@ -600,6 +608,7 @@ Rectangle {
Layout.column: 2
Layout.row: 0
Layout.preferredWidth: recipientLayout.thirdRowWidth
+ Layout.maximumWidth: recipientLayout.thirdRowWidth
horizontalAlignment: Text.AlignHCenter
font.family: MoneroComponents.Style.fontRegular.name
text: "XMR"
@@ -611,11 +620,15 @@ Rectangle {
Layout.row: recipientModel.count > 1 ? 1 : 0
Layout.preferredWidth: recipientLayout.secondRowWidth
Layout.topMargin: recipientModel.count > 1 ? 0 : 5
+ Layout.maximumWidth: recipientLayout.secondRowWidth
borderDisabled: true
fontFamily: MoneroComponents.Style.fontMonoRegular.name
fontSize: 14
inputHeight: 30
- inputPadding: 0
+ inputPaddingLeft: 0
+ inputPaddingRight: 0
+ inputPaddingTop: 0
+ inputPaddingBottom: 0
opacity: 0.7
readOnly: true
text: fiatApiConvertToFiat(walletManager.displayAmount(recipientModel.getAmountTotal()))
@@ -627,6 +640,7 @@ Rectangle {
Layout.row: recipientModel.count > 1 ? 1 : 0
Layout.preferredWidth: recipientLayout.thirdRowWidth
Layout.topMargin: recipientModel.count > 1 ? 0 : 5
+ Layout.maximumWidth: recipientLayout.thirdRowWidth
font.family: MoneroComponents.Style.fontRegular.name
horizontalAlignment: Text.AlignHCenter
opacity: 0.7
diff --git a/pages/settings/SettingsLog.qml b/pages/settings/SettingsLog.qml
index 2b84ed60..4c393ee9 100644
--- a/pages/settings/SettingsLog.qml
+++ b/pages/settings/SettingsLog.qml
@@ -226,10 +226,13 @@ Rectangle {
MoneroComponents.LineEdit {
id: sendCommandText
Layout.fillWidth: true
+ inputPaddingTop: 0
+ inputPaddingBottom: 0
property var lastCommands: []
property int currentCommandIndex
enabled: !persistentSettings.useRemoteNode
fontBold: false
+ fontSize: 16
placeholderText: qsTr("Type a command (e.g '%1' or '%2') and press Enter").arg("help").arg("status") + translationManager.emptyString
placeholderFontSize: 16
Keys.onUpPressed: {