From a9b6a70d1594f18b77187b5423e88086129429f9 Mon Sep 17 00:00:00 2001
From: Sander Ferdinand <sa.ferdinand@gmail.com>
Date: Fri, 12 Jan 2018 01:17:20 +0100
Subject: [PATCH] Cleanup after rebase

---
 LeftPanel.qml                    | 29 ++++++++++++++---------------
 components/NewPasswordDialog.qml |  8 --------
 components/StandardDialog.qml    |  2 +-
 pages/Settings.qml               |  9 +++++----
 pages/TxKey.qml                  |  6 +-----
 5 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/LeftPanel.qml b/LeftPanel.qml
index a999f9ad..d2eb3df0 100644
--- a/LeftPanel.qml
+++ b/LeftPanel.qml
@@ -110,7 +110,7 @@ Rectangle {
                 anchors.leftMargin: 20
                 anchors.verticalCenter: parent.verticalCenter
                 height: 490 * scaleRatio
-                width: 50 * scaleRatio
+                width: 259 * scaleRatio
 
                 Image {
                     width: 259; height: 170
@@ -128,22 +128,21 @@ Rectangle {
                     anchors.leftMargin: 192
                     font.bold: true
                     font.pixelSize: 12
-                    color: "red"
-                    opacity: 1
+                    color: "#f33434"
                 }
 
-                // @TODO: implement
-                //                Text {
-                //                    id: viewOnlyLabel
-                //                    visible: viewOnly
-                //                    text: qsTr("View Only") + translationManager.emptyString
-                //                    anchors.top: logo.bottom
-                //                    anchors.topMargin: 5
-                //                    anchors.left: parent.left
-                //                    anchors.leftMargin: 50
-                //                    font.bold: true
-                //                    color: "blue"
-                //                }
+                Text {
+                    id: viewOnlyLabel
+                    visible: viewOnly
+                    text: qsTr("View Only") + translationManager.emptyString
+                    anchors.top: parent.top
+                    anchors.topMargin: 8
+                    anchors.right: testnetLabel.visible ? testnetLabel.left : parent.right
+                    anchors.rightMargin: 8
+                    font.pixelSize: 12
+                    font.bold: true
+                    color: "#ff9323"
+                }
             }
 
             Item {
diff --git a/components/NewPasswordDialog.qml b/components/NewPasswordDialog.qml
index 414a225d..af9c0973 100644
--- a/components/NewPasswordDialog.qml
+++ b/components/NewPasswordDialog.qml
@@ -224,10 +224,6 @@ Item {
             
             MoneroComponents.StandardButton {
                 id: cancelButton
-                shadowReleasedColor: "#FF4304"
-                shadowPressedColor: "#B32D00"
-                releasedColor: "#FF6C3C"
-                pressedColor: "#FF4304"
                 text: qsTr("Cancel") + translationManager.emptyString
                 KeyNavigation.tab: passwordInput1
                 onClicked: {
@@ -237,10 +233,6 @@ Item {
             }
             MoneroComponents.StandardButton {
                 id: okButton
-                shadowReleasedColor: "#FF4304"
-                shadowPressedColor: "#B32D00"
-                releasedColor: "#FF6C3C"
-                pressedColor: "#FF4304"
                 text: qsTr("Continue")
                 KeyNavigation.tab: cancelButton
                 enabled: passwordInput1.text === passwordInput2.text
diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml
index 4804f294..56ce06e2 100644
--- a/components/StandardDialog.qml
+++ b/components/StandardDialog.qml
@@ -120,7 +120,7 @@ Rectangle {
                 font.family: "Arial"
                 textFormat: TextEdit.AutoText
                 readOnly: true
-                font.pixelSize: 12 * scaleRatio
+                font.pixelSize: 14 * scaleRatio
                 selectByMouse: false
                 wrapMode: TextEdit.Wrap
                 textColor: Style.defaultFontColor
diff --git a/pages/Settings.qml b/pages/Settings.qml
index 76d03535..4fd49cb4 100644
--- a/pages/Settings.qml
+++ b/pages/Settings.qml
@@ -168,14 +168,15 @@ Rectangle {
                     }
                 }
             }
+        }
+
+        RowLayout{
+            Layout.fillWidth: true
 
             StandardButton {
                 id: changePasswordButton
+                small: true
                 text: qsTr("Change password") + translationManager.emptyString
-                shadowReleasedColor: "#FF4304"
-                shadowPressedColor: "#B32D00"
-                releasedColor: "#FF6C3C"
-                pressedColor: "#FF4304"
                 onClicked: {
                     passwordDialog.onAcceptedCallback = function() {
                         if(appWindow.walletPassword === passwordDialog.password){
diff --git a/pages/TxKey.qml b/pages/TxKey.qml
index 2e8f3a37..8ed3b8fe 100644
--- a/pages/TxKey.qml
+++ b/pages/TxKey.qml
@@ -184,11 +184,7 @@ Rectangle {
             anchors.topMargin: 17
             width: 60
             text: qsTr("Generate") + translationManager.emptyString
-            shadowReleasedColor: "#FF4304"
-            shadowPressedColor: "#B32D00"
-            releasedColor: "#FF6C3C"
-            pressedColor: "#FF4304"
-            enabled: checkTxID(getProofTxIdLine.text) && (getProofAddressLine.text.length == 0 || checkAddress(getProofAddressLine.text, appWindow.persistentSettings.nettype))
+            enabled: checkTxID(getProofTxIdLine.text) && (getProofAddressLine.text.length == 0 || checkAddress(getProofAddressLine.text, appWindow.persistentSettings.testnet))
             onClicked: {
                 console.log("getProof: Generate clicked: txid " + getProofTxIdLine.text + ", address " + getProofAddressLine.text + ", message: " + getProofMessageLine.text);
                 root.getProofClicked(getProofTxIdLine.text, getProofAddressLine.text, getProofMessageLine.text)