github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2024-12-22 03:15:52 +01:00
Code Releases Activity

pages mobile scaling

Browse Source
This commit is contained in:
Jaquee 2017-08-07 16:05:54 +02:00
parent 9e0db8f4ff
commit 4dc0d36b98
5 changed files with 47 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pages/History.qml
View File

@ -488,7 +488,7 @@ Rectangle {
ListModel { ListModel {
id: columnsModel id: columnsModel
property int pidWidth: 127 * scaleRatio
ListElement { columnName: "Payment ID"; columnWidth: 127 } ListElement { columnName: "Payment ID"; columnWidth: 127 }
ListElement { columnName: "Date"; columnWidth: 100 } ListElement { columnName: "Date"; columnWidth: 100 }
ListElement { columnName: "Block height"; columnWidth: 150 } ListElement { columnName: "Block height"; columnWidth: 150 }
@ -498,12 +498,13 @@ Rectangle {
TableHeader { TableHeader {
id: header id: header
visible: !isMobile
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 17 anchors.topMargin: 17 * scaleRatio
anchors.leftMargin: 14 anchors.leftMargin: 14 * scaleRatio
anchors.rightMargin: 14 anchors.rightMargin: 14 * scaleRatio
dataModel: columnsModel dataModel: columnsModel
offset: 20 offset: 20
onSortRequest: { onSortRequest: {
@ -533,7 +534,7 @@ Rectangle {
Scroll { Scroll {
id: flickableScroll id: flickableScroll
anchors.right: table.right anchors.right: table.right
anchors.rightMargin: -14 anchors.rightMargin: !isMobile ? -14 * scaleRatio : 0
anchors.top: table.top anchors.top: table.top
anchors.bottom: table.bottom anchors.bottom: table.bottom
flickable: table flickable: table
@ -545,8 +546,8 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
anchors.top: header.bottom anchors.top: header.bottom
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.leftMargin: 14 anchors.leftMargin: 14 * scaleRatio
anchors.rightMargin: 14 anchors.rightMargin: 14 * scaleRatio
onContentYChanged: flickableScroll.flickableContentYChanged() onContentYChanged: flickableScroll.flickableContentYChanged()
model: root.model model: root.model
addressBookModel: null addressBookModel: null

19
pages/Receive.qml
View File

@ -169,24 +169,23 @@ Rectangle {
ColumnLayout { ColumnLayout {
id: mainLayout id: mainLayout
anchors.margins: (isMobile)? 17 : 40 anchors.margins: (isMobile)? 17 : 40
anchors.topMargin: 40 anchors.topMargin: 40 * scaleRatio
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
spacing: 20 spacing: 20 * scaleRatio
property int labelWidth: 120 property int labelWidth: 120 * scaleRatio
property int editWidth: 400 property int editWidth: 400 * scaleRatio
property int lineEditFontSize: 12 property int lineEditFontSize: 12 * scaleRatio
property int qrCodeSize: 240 property int qrCodeSize: 240 * scaleRatio
ColumnLayout { ColumnLayout {
id: addressRow id: addressRow
Label { Label {
id: addressLabel id: addressLabel
fontSize: 14
text: qsTr("Address") + translationManager.emptyString text: qsTr("Address") + translationManager.emptyString
width: mainLayout.labelWidth width: mainLayout.labelWidth
} }
@ -218,7 +217,6 @@ Rectangle {
Label { Label {
Layout.columnSpan: 2 Layout.columnSpan: 2
id: paymentIdLabel id: paymentIdLabel
fontSize: 14
text: qsTr("Payment ID") + translationManager.emptyString text: qsTr("Payment ID") + translationManager.emptyString
width: mainLayout.labelWidth width: mainLayout.labelWidth
} }
@ -246,7 +244,6 @@ Rectangle {
StandardButton { StandardButton {
id: generatePaymentId id: generatePaymentId
width: 80
shadowReleasedColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C" releasedColor: "#FF6C3C"
@ -258,7 +255,6 @@ Rectangle {
StandardButton { StandardButton {
id: clearPaymentId id: clearPaymentId
enabled: !!paymentIdLine.text enabled: !!paymentIdLine.text
width: 80
shadowReleasedColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C" releasedColor: "#FF6C3C"
@ -272,7 +268,6 @@ Rectangle {
id: integratedAddressRow id: integratedAddressRow
Label { Label {
id: integratedAddressLabel id: integratedAddressLabel
fontSize: 14
text: qsTr("Integrated address") + translationManager.emptyString text: qsTr("Integrated address") + translationManager.emptyString
width: mainLayout.labelWidth width: mainLayout.labelWidth
} }
@ -305,7 +300,6 @@ Rectangle {
id: amountRow id: amountRow
Label { Label {
id: amountLabel id: amountLabel
fontSize: 14
text: qsTr("Amount") + translationManager.emptyString text: qsTr("Amount") + translationManager.emptyString
width: mainLayout.labelWidth width: mainLayout.labelWidth
} }
@ -333,7 +327,6 @@ Rectangle {
Label { Label {
id: trackingLabel id: trackingLabel
fontSize: 14
textFormat: Text.RichText textFormat: Text.RichText
text: qsTr("<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style>\ text: qsTr("<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style>\
Tracking <font size='2'> (</font><a href='#'>help</a><font size='2'>)</font>") Tracking <font size='2'> (</font><a href='#'>help</a><font size='2'>)</font>")

25
pages/Settings.qml
View File

@ -51,17 +51,15 @@ Rectangle {
// Daemon settings // Daemon settings
daemonAddress = persistentSettings.daemon_address.split(":"); daemonAddress = persistentSettings.daemon_address.split(":");
console.log("address: " + persistentSettings.daemon_address)
// try connecting to daemon
} }
ColumnLayout { ColumnLayout {
id: mainLayout id: mainLayout
anchors.margins: 17 anchors.margins: 17 * scaleRatio
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
spacing: 10 spacing: 10 * scaleRatio
//! Manage wallet //! Manage wallet
RowLayout { RowLayout {
@ -70,8 +68,7 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
color: "#4A4949" color: "#4A4949"
text: qsTr("Manage wallet") + translationManager.emptyString text: qsTr("Manage wallet") + translationManager.emptyString
fontSize: 16 Layout.topMargin: 10 * scaleRatio
Layout.topMargin: 10
} }
} }
@ -243,7 +240,6 @@ Rectangle {
id: blockchainFolderLabel id: blockchainFolderLabel
color: "#4A4949" color: "#4A4949"
text: qsTr("Blockchain location") + translationManager.emptyString text: qsTr("Blockchain location") + translationManager.emptyString
fontSize: 16
} }
LineEdit { LineEdit {
id: blockchainFolder id: blockchainFolder
@ -412,9 +408,8 @@ Rectangle {
Label { Label {
color: "#4A4949" color: "#4A4949"
text: qsTr("Log level") + translationManager.emptyString text: qsTr("Log level") + translationManager.emptyString
fontSize: 16 anchors.topMargin: 30 * scaleRatio
anchors.topMargin: 30 Layout.topMargin: 30 * scaleRatio
Layout.topMargin: 30
} }
} }
Rectangle { Rectangle {
@ -442,7 +437,6 @@ Rectangle {
LineEdit { LineEdit {
id: logCategories id: logCategories
Layout.preferredWidth: 200
Layout.fillWidth: true Layout.fillWidth: true
text: appWindow.persistentSettings.logCategories text: appWindow.persistentSettings.logCategories
placeholderText: qsTr("(e.g. *:WARNING,net.p2p:DEBUG)") + translationManager.emptyString placeholderText: qsTr("(e.g. *:WARNING,net.p2p:DEBUG)") + translationManager.emptyString
@ -463,8 +457,8 @@ Rectangle {
color: "#4A4949" color: "#4A4949"
text: qsTr("Debug info") + translationManager.emptyString text: qsTr("Debug info") + translationManager.emptyString
fontSize: 16 fontSize: 16
anchors.topMargin: 30 anchors.topMargin: 30 * scaleRatio
Layout.topMargin: 30 Layout.topMargin: 30 * scaleRatio
} }
} }
Rectangle { Rectangle {
@ -472,13 +466,11 @@ Rectangle {
height: 1 height: 1
color: "#DEDEDE" color: "#DEDEDE"
} }
TextBlock { TextBlock {
Layout.topMargin: 8 Layout.topMargin: 8
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("GUI version: ") + Version.GUI_VERSION + translationManager.emptyString text: qsTr("GUI version: ") + Version.GUI_VERSION + translationManager.emptyString
} }
TextBlock { TextBlock {
id: guiMoneroVersion id: guiMoneroVersion
Layout.fillWidth: true Layout.fillWidth: true
@ -604,7 +596,6 @@ Rectangle {
confirmationDialog.text += qsTr("Note: lmdb folder not found. A new folder will be created.") + "\n\n" confirmationDialog.text += qsTr("Note: lmdb folder not found. A new folder will be created.") + "\n\n"
} }
confirmationDialog.icon = StandardIcon.Question confirmationDialog.icon = StandardIcon.Question
confirmationDialog.cancelText = qsTr("Cancel") confirmationDialog.cancelText = qsTr("Cancel")
@ -646,8 +637,6 @@ Rectangle {
Component.onCompleted: { Component.onCompleted: {
if(typeof daemonManager != "undefined") if(typeof daemonManager != "undefined")
daemonManager.daemonConsoleUpdated.connect(onDaemonConsoleUpdated) daemonManager.daemonConsoleUpdated.connect(onDaemonConsoleUpdated)
} }
function onDaemonConsoleUpdated(message){ function onDaemonConsoleUpdated(message){

58
pages/Sign.qml
View File

@ -39,10 +39,6 @@ import moneroComponents.WalletManager 1.0
Rectangle { Rectangle {
id: mainLayout id: mainLayout
property int labelWidth: 120
// property int editWidth: 400
property int lineEditFontSize: 12
color: "#F0EEEE" color: "#F0EEEE"
Clipboard { id: clipboard } Clipboard { id: clipboard }
@ -92,13 +88,13 @@ Rectangle {
// sign / verify // sign / verify
ColumnLayout { ColumnLayout {
anchors.margins: 17 anchors.margins: 17 * scaleRatio
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
spacing: 20 spacing: 20 * scaleRatio
// sign // sign
ColumnLayout { ColumnLayout {
@ -118,9 +114,7 @@ Rectangle {
Label { Label {
id: signMessageLabel id: signMessageLabel
fontSize: 14
text: qsTr("Either message:") + translationManager.emptyString text: qsTr("Either message:") + translationManager.emptyString
width: mainLayout.labelWidth
} }
RowLayout { RowLayout {
@ -133,10 +127,8 @@ Rectangle {
id: signMessageLine id: signMessageLine
anchors.left: parent.left anchors.left: parent.left
anchors.right: signMessageButton.left anchors.right: signMessageButton.left
fontSize: mainLayout.lineEditFontSize
placeholderText: qsTr("Message to sign") + translationManager.emptyString; placeholderText: qsTr("Message to sign") + translationManager.emptyString;
readOnly: false readOnly: false
// Layout.fillWidth: true
onTextChanged: signSignatureLine.text = "" onTextChanged: signSignatureLine.text = ""
IconButton { IconButton {
@ -152,7 +144,6 @@ Rectangle {
StandardButton { StandardButton {
id: signMessageButton id: signMessageButton
anchors.right: parent.right anchors.right: parent.right
width: 60
text: qsTr("Sign") + translationManager.emptyString text: qsTr("Sign") + translationManager.emptyString
shadowReleasedColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
@ -168,9 +159,7 @@ Rectangle {
Label { Label {
id: signMessageFileLabel id: signMessageFileLabel
fontSize: 14
text: qsTr("Or file:") + translationManager.emptyString text: qsTr("Or file:") + translationManager.emptyString
width: mainLayout.labelWidth
} }
RowLayout { RowLayout {
@ -192,8 +181,7 @@ Rectangle {
StandardButton { StandardButton {
id: loadFileToSignButton id: loadFileToSignButton
anchors.rightMargin: 17 anchors.rightMargin: 17 * scaleRatio
width: 60
text: qsTr("Select") + translationManager.emptyString text: qsTr("Select") + translationManager.emptyString
shadowReleasedColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
@ -227,7 +215,6 @@ Rectangle {
StandardButton { StandardButton {
id: signFileButton id: signFileButton
anchors.right: parent.right anchors.right: parent.right
width: 60
text: qsTr("Sign") + translationManager.emptyString text: qsTr("Sign") + translationManager.emptyString
shadowReleasedColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
@ -243,17 +230,15 @@ Rectangle {
RowLayout { RowLayout {
id: signSignatureRow id: signSignatureRow
anchors.topMargin: 17 anchors.topMargin: 17 * scaleRatio
Label { Label {
id: signSignatureLabel id: signSignatureLabel
fontSize: 14
text: qsTr("Signature") + translationManager.emptyString text: qsTr("Signature") + translationManager.emptyString
} }
LineEdit { LineEdit {
id: signSignatureLine id: signSignatureLine
fontSize: mainLayout.lineEditFontSize
placeholderText: qsTr("Signature") + translationManager.emptyString; placeholderText: qsTr("Signature") + translationManager.emptyString;
readOnly: true readOnly: true
Layout.fillWidth: true Layout.fillWidth: true
@ -290,14 +275,12 @@ Rectangle {
Label { Label {
id: verifyMessageLabel id: verifyMessageLabel
fontSize: 14
text: qsTr("Either message:") + translationManager.emptyString text: qsTr("Either message:") + translationManager.emptyString
width: mainLayout.labelWidth
} }
RowLayout { RowLayout {
id: verifyMessageRow id: verifyMessageRow
anchors.topMargin: 17 anchors.topMargin: 17 * scaleRatio
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
@ -305,7 +288,6 @@ Rectangle {
id: verifyMessageLine id: verifyMessageLine
anchors.left: parent.left anchors.left: parent.left
anchors.right: verifyMessageButton.left anchors.right: verifyMessageButton.left
fontSize: mainLayout.lineEditFontSize
placeholderText: qsTr("Message to verify") + translationManager.emptyString; placeholderText: qsTr("Message to verify") + translationManager.emptyString;
readOnly: false readOnly: false
Layout.fillWidth: true Layout.fillWidth: true
@ -323,7 +305,6 @@ Rectangle {
StandardButton { StandardButton {
id: verifyMessageButton id: verifyMessageButton
anchors.right: parent.right anchors.right: parent.right
width: 60
text: qsTr("Verify") + translationManager.emptyString text: qsTr("Verify") + translationManager.emptyString
shadowReleasedColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
@ -339,14 +320,12 @@ Rectangle {
Label { Label {
id: verifyMessageFileLabel id: verifyMessageFileLabel
fontSize: 14
text: qsTr("Or file:") + translationManager.emptyString text: qsTr("Or file:") + translationManager.emptyString
width: mainLayout.labelWidth
} }
RowLayout { RowLayout {
id: verifyFileRow id: verifyFileRow
anchors.topMargin: 17 anchors.topMargin: 17 * scaleRatio
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
@ -363,8 +342,7 @@ Rectangle {
StandardButton { StandardButton {
id: loadFileToVerifyButton id: loadFileToVerifyButton
anchors.rightMargin: 17 anchors.rightMargin: 17 * scaleRatio
width: 60
text: qsTr("Select") + translationManager.emptyString text: qsTr("Select") + translationManager.emptyString
shadowReleasedColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
@ -379,7 +357,6 @@ Rectangle {
id: verifyFileLine id: verifyFileLine
anchors.left: loadFileToVerifyButton.right anchors.left: loadFileToVerifyButton.right
anchors.right: verifyFileButton.left anchors.right: verifyFileButton.left
fontSize: mainLayout.lineEditFontSize
placeholderText: qsTr("Filename with message to verify") + translationManager.emptyString; placeholderText: qsTr("Filename with message to verify") + translationManager.emptyString;
readOnly: false readOnly: false
Layout.fillWidth: true Layout.fillWidth: true
@ -397,7 +374,6 @@ Rectangle {
StandardButton { StandardButton {
id: verifyFileButton id: verifyFileButton
anchors.right: parent.right anchors.right: parent.right
width: 60
text: qsTr("Verify") + translationManager.emptyString text: qsTr("Verify") + translationManager.emptyString
shadowReleasedColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
@ -411,17 +387,15 @@ Rectangle {
} }
} }
Label { Text {
id: verifyAddressLabel id: verifyAddressLabel
fontSize: 14 text: qsTr("<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: %1px;}</style>\
width: mainLayout.labelWidth Signing address <font size='%2'> ( Paste in or select from </font> <a href='#'>Address book</a><font size='%3'> )</font>").arg(14 * scaleRatio).arg(2 * scaleRatio).arg(2 * scaleRatio)
textFormat: Text.RichText
text: qsTr("<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style>\
Signing address <font size='2'> ( Paste in or select from </font> <a href='#'>Address book</a><font size='2'> )</font>")
+ translationManager.emptyString + translationManager.emptyString
// Layout.fillWidth: true
wrapMode: Text.Wrap wrapMode: Text.Wrap
font.pixelSize: 14 * scaleRatio
Layout.fillWidth: true
textFormat: Text.RichText
onLinkActivated: appWindow.showPageRequest("AddressBook") onLinkActivated: appWindow.showPageRequest("AddressBook")
} }
@ -430,24 +404,22 @@ Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.top: verifyAddressLabel.bottom anchors.top: verifyAddressLabel.bottom
anchors.topMargin: 5 anchors.topMargin: 5 * scaleRatio
placeholderText: "4..." placeholderText: "4..."
// validator: RegExpValidator { regExp: /[0-9A-Fa-f]{95}/g } // validator: RegExpValidator { regExp: /[0-9A-Fa-f]{95}/g }
} }
RowLayout { RowLayout {
id: verifySignatureRow id: verifySignatureRow
anchors.topMargin: 17 anchors.topMargin: 17 * scaleRatio
Label { Label {
id: verifySignatureLabel id: verifySignatureLabel
fontSize: 14
text: qsTr("Signature") + translationManager.emptyString text: qsTr("Signature") + translationManager.emptyString
} }
LineEdit { LineEdit {
id: verifySignatureLine id: verifySignatureLine
fontSize: mainLayout.lineEditFontSize
placeholderText: qsTr("Signature") + translationManager.emptyString; placeholderText: qsTr("Signature") + translationManager.emptyString;
Layout.fillWidth: true Layout.fillWidth: true

15
pages/Transfer.qml
View File

@ -433,8 +433,10 @@ Rectangle {
anchors.top: pageRoot.bottom anchors.top: pageRoot.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.margins: 17 anchors.leftMargin: 17 * scaleRatio
spacing:10 anchors.topMargin: 17 * scaleRatio
anchors.bottomMargin: 17 * scaleRatio
spacing: 10 * scaleRatio
enabled: !viewOnly || pageRoot.enabled enabled: !viewOnly || pageRoot.enabled
RowLayout { RowLayout {
@ -455,13 +457,14 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
height: 1 height: 1
color: "#DEDEDE" color: "#DEDEDE"
Layout.bottomMargin: 30 Layout.bottomMargin: 30 * scaleRatio
} }
RowLayout { RowLayout {
visible: persistentSettings.transferShowAdvanced visible: persistentSettings.transferShowAdvanced
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
Layout.fillWidth: true
Label { Label {
id: privacyLabel id: privacyLabel
fontSize: 14 fontSize: 14
@ -489,7 +492,7 @@ Rectangle {
GridLayout { GridLayout {
visible: persistentSettings.transferShowAdvanced visible: persistentSettings.transferShowAdvanced
Layout.topMargin: 50 Layout.topMargin: 50 * scaleRatio
columns: (isMobile) ? 2 : 6 columns: (isMobile) ? 2 : 6
@ -657,8 +660,8 @@ Rectangle {
Rectangle { Rectangle {
x: root.width/2 - width/2 x: root.width/2 - width/2
y: root.height/2 - height/2 y: root.height/2 - height/2
height:statusText.paintedHeight + 50 height:statusText.paintedHeight + 50 * scaleRatio
width:statusText.paintedWidth + 40 width:statusText.paintedWidth + 40 * scaleRatio
visible: statusText.text != "" visible: statusText.text != ""
opacity: 0.9 opacity: 0.9