monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-10 21:04:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup after rebase

Browse source
This commit is contained in:
Sander Ferdinand 2018-01-12 01:17:20 +01:00 committed by moneromooo-monero
parent cf2791a246
commit a9b6a70d15
5 changed files with 21 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
LeftPanel.qml
View file

@ -110,7 +110,7 @@ Rectangle {
anchors.leftMargin: 20 anchors.leftMargin: 20
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
height: 490 * scaleRatio height: 490 * scaleRatio
width: 50 * scaleRatio width: 259 * scaleRatio
Image { Image {
width: 259; height: 170 width: 259; height: 170
@ -128,22 +128,21 @@ Rectangle {
anchors.leftMargin: 192 anchors.leftMargin: 192
font.bold: true font.bold: true
font.pixelSize: 12 font.pixelSize: 12
color: "red" color: "#f33434"
opacity: 1
} }
// @TODO: implement Text {
// Text { id: viewOnlyLabel
// id: viewOnlyLabel visible: viewOnly
// visible: viewOnly text: qsTr("View Only") + translationManager.emptyString
// text: qsTr("View Only") + translationManager.emptyString anchors.top: parent.top
// anchors.top: logo.bottom anchors.topMargin: 8
// anchors.topMargin: 5 anchors.right: testnetLabel.visible ? testnetLabel.left : parent.right
// anchors.left: parent.left anchors.rightMargin: 8
// anchors.leftMargin: 50 font.pixelSize: 12
// font.bold: true font.bold: true
// color: "blue" color: "#ff9323"
// } }
} }
Item { Item {

8
components/NewPasswordDialog.qml
View file

@ -224,10 +224,6 @@ Item {
MoneroComponents.StandardButton { MoneroComponents.StandardButton {
id: cancelButton id: cancelButton
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
text: qsTr("Cancel") + translationManager.emptyString text: qsTr("Cancel") + translationManager.emptyString
KeyNavigation.tab: passwordInput1 KeyNavigation.tab: passwordInput1
onClicked: { onClicked: {
@ -237,10 +233,6 @@ Item {
} }
MoneroComponents.StandardButton { MoneroComponents.StandardButton {
id: okButton id: okButton
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
text: qsTr("Continue") text: qsTr("Continue")
KeyNavigation.tab: cancelButton KeyNavigation.tab: cancelButton
enabled: passwordInput1.text === passwordInput2.text enabled: passwordInput1.text === passwordInput2.text

2
components/StandardDialog.qml
View file

@ -120,7 +120,7 @@ Rectangle {
font.family: "Arial" font.family: "Arial"
textFormat: TextEdit.AutoText textFormat: TextEdit.AutoText
readOnly: true readOnly: true
font.pixelSize: 12 * scaleRatio font.pixelSize: 14 * scaleRatio
selectByMouse: false selectByMouse: false
wrapMode: TextEdit.Wrap wrapMode: TextEdit.Wrap
textColor: Style.defaultFontColor textColor: Style.defaultFontColor

9
pages/Settings.qml
View file

@ -168,14 +168,15 @@ Rectangle {
} }
} }
} }
}
RowLayout{
Layout.fillWidth: true
StandardButton { StandardButton {
id: changePasswordButton id: changePasswordButton
small: true
text: qsTr("Change password") + translationManager.emptyString text: qsTr("Change password") + translationManager.emptyString
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
onClicked: { onClicked: {
passwordDialog.onAcceptedCallback = function() { passwordDialog.onAcceptedCallback = function() {
if(appWindow.walletPassword === passwordDialog.password){ if(appWindow.walletPassword === passwordDialog.password){

6
pages/TxKey.qml
View file

@ -184,11 +184,7 @@ Rectangle {
anchors.topMargin: 17 anchors.topMargin: 17
width: 60 width: 60
text: qsTr("Generate") + translationManager.emptyString text: qsTr("Generate") + translationManager.emptyString
shadowReleasedColor: "#FF4304" enabled: checkTxID(getProofTxIdLine.text) && (getProofAddressLine.text.length == 0 || checkAddress(getProofAddressLine.text, appWindow.persistentSettings.testnet))
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
enabled: checkTxID(getProofTxIdLine.text) && (getProofAddressLine.text.length == 0 || checkAddress(getProofAddressLine.text, appWindow.persistentSettings.nettype))
onClicked: { onClicked: {
console.log("getProof: Generate clicked: txid " + getProofTxIdLine.text + ", address " + getProofAddressLine.text + ", message: " + getProofMessageLine.text); console.log("getProof: Generate clicked: txid " + getProofTxIdLine.text + ", address " + getProofAddressLine.text + ", message: " + getProofMessageLine.text);
root.getProofClicked(getProofTxIdLine.text, getProofAddressLine.text, getProofMessageLine.text) root.getProofClicked(getProofTxIdLine.text, getProofAddressLine.text, getProofMessageLine.text)