StandardButton - removed unused properties and some layout changes to settings page

8 files changed, 10 insertions, 66 deletions

diff --git a/components/DaemonConsole.qml b/components/DaemonConsole.qml
index 8bcd8a23..2643a339 100644
--- a/components/DaemonConsole.qml
+++ b/components/DaemonConsole.qml
@@ -110,10 +110,6 @@ Window {
                 id: okButton
                 width: 120
                 fontSize: 14
-                shadowReleasedColor: "#FF4304"
-                shadowPressedColor: "#B32D00"
-                releasedColor: "#FF6C3C"
-                pressedColor: "#FF4304"
                 text: qsTr("Close") + translationManager.emptyString
                 onClicked: {
                     root.close()
@@ -138,10 +134,6 @@ Window {
 //                id: sendCommandButton
 //                enabled: sendCommandText.text.length > 0
 //                fontSize: 14
-//                shadowReleasedColor: "#FF4304"
-//                shadowPressedColor: "#B32D00"
-//                releasedColor: "#FF6C3C"
-//                pressedColor: "#FF4304"
 //                text: qsTr("Send command")
 //                onClicked: {
 //                    daemonManager.sendCommand(sendCommandText.text,currentWallet.testnet);
diff --git a/components/DaemonManagerDialog.qml b/components/DaemonManagerDialog.qml
index d760c317..07dec4a0 100644
--- a/components/DaemonManagerDialog.qml
+++ b/components/DaemonManagerDialog.qml
@@ -108,10 +108,6 @@ Window {
                 id: okButton
                 visible:false
                 fontSize: 14
-                shadowReleasedColor: "#FF4304"
-                shadowPressedColor: "#B32D00"
-                releasedColor: "#FF6C3C"
-                pressedColor: "#FF4304"
                 text: qsTr("Start daemon (%1)").arg(countDown)
                 KeyNavigation.tab: cancelButton
                 onClicked: {
@@ -125,10 +121,6 @@ Window {
             MoneroComponents.StandardButton {
                 id: cancelButton
                 fontSize: 14
-                shadowReleasedColor: "#FF4304"
-                shadowPressedColor: "#B32D00"
-                releasedColor: "#FF6C3C"
-                pressedColor: "#FF4304"
                 text: qsTr("Use custom settings")
 
                 onClicked: {
diff --git a/components/DatePicker.qml b/components/DatePicker.qml
index dafba285..8988f2bd 100644
--- a/components/DatePicker.qml
+++ b/components/DatePicker.qml
@@ -92,10 +92,6 @@ Item {
             StandardButton {
                 id: button
                 anchors.fill: parent
-                shadowReleasedColor: "#DBDBDB"
-                shadowPressedColor: "#888888"
-                releasedColor: "#F0EEEE"
-                pressedColor: "#DBDBDB"
                 icon: "../images/datePicker.png"
                 visible: !datePicker.expanded
                 onClicked: datePicker.expanded = true
diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml
index cac884ae..18d05f6d 100644
--- a/components/HistoryTable.qml
+++ b/components/HistoryTable.qml
@@ -96,10 +96,6 @@ ListView {
             anchors.topMargin: parent.height/2 - this.height/2
             width: 80
             fontSize: 14
-            shadowReleasedColor: "#FF4304"
-            shadowPressedColor: "#B32D00"
-            releasedColor: "#FF6C3C"
-            pressedColor: "#FF4304"
             text: qsTr("Details")
             onClicked: {
                 var tx_key = currentWallet.getTxKey(hash)
diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml
index d2315011..e8563a73 100644
--- a/components/PasswordDialog.qml
+++ b/components/PasswordDialog.qml
@@ -149,10 +149,6 @@ Item {
             
             MoneroComponents.StandardButton {
                 id: cancelButton
-                shadowReleasedColor: "#FF4304"
-                shadowPressedColor: "#B32D00"
-                releasedColor: "#FF6C3C"
-                pressedColor: "#FF4304"
                 text: qsTr("Cancel") + translationManager.emptyString
                 KeyNavigation.tab: passwordInput
                 onClicked: {
@@ -162,10 +158,6 @@ Item {
             }
             MoneroComponents.StandardButton {
                 id: okButton
-                shadowReleasedColor: "#FF4304"
-                shadowPressedColor: "#B32D00"
-                releasedColor: "#FF6C3C"
-                pressedColor: "#FF4304"
                 text: qsTr("Continue")
                 KeyNavigation.tab: cancelButton
                 onClicked: {
diff --git a/components/RemoteNodeEdit.qml b/components/RemoteNodeEdit.qml
index 295e4b16..49413436 100644
--- a/components/RemoteNodeEdit.qml
+++ b/components/RemoteNodeEdit.qml
@@ -33,9 +33,12 @@ import QtQuick.Layouts 1.1
 
 GridLayout {
     columns: (isMobile) ? 1 : 2
+    columnSpacing: 32
     id: root
     property alias daemonAddrText: daemonAddr.text
     property alias daemonPortText: daemonPort.text
+    property alias daemonAddrLabelText: daemonAddr.labelText
+    property alias daemonPortLabelText: daemonPort.labelText
 
     signal editingFinished()
 
@@ -50,7 +53,6 @@ GridLayout {
         onEditingFinished: root.editingFinished()
     }
 
-
     LineEdit {
         id: daemonPort
         Layout.fillWidth: true
diff --git a/components/StandardButton.qml b/components/StandardButton.qml
index 440505ee..f41c104a 100644
--- a/components/StandardButton.qml
+++ b/components/StandardButton.qml
@@ -33,10 +33,6 @@ import "." 1.0
 Item {
     id: button
     height: 37 * scaleRatio
-    property string shadowPressedColor: Style.buttonBackgroundColor
-    property string shadowReleasedColor: Style.buttonBackgroundColor
-    property string pressedColor: Style.buttonBackgroundColor
-    property string releasedColor: Style.buttonBackgroundColor
     property string icon: ""
     property string textColor: button.enabled? Style.buttonTextColor: Style.buttonTextColorDisabled
     property int fontSize: 16 * scaleRatio
@@ -57,8 +53,8 @@ Item {
         anchors.right: parent.right
         height: parent.height - 1
         radius: 3
+//        color: parent.enabled ? Style.buttonBackgroundColor : Style.buttonBackgroundColorDisabled
         color: parent.enabled ? Style.buttonBackgroundColor : Style.buttonBackgroundColorDisabled
-        border.color: Qt.darker(parent.releasedColor)
         border.width: parent.focus ? 1 : 0
 
         MouseArea{
@@ -68,32 +64,18 @@ Item {
 
             propagateComposedEvents: true
 
+            // possibly do some hover effects here
             onEntered: {
-                if(button.enabled) parent.color = Style.buttonBackgroundColorHover;
-                else parent.color = Style.buttonBackgroundColorDisabledHover;
+//                if(button.enabled) parent.color = Style.buttonBackgroundColorHover;
+//                else parent.color = Style.buttonBackgroundColorDisabledHover;
             }
             onExited: {
-                if(button.enabled) parent.color = Style.buttonBackgroundColor;
-                else parent.color = Style.buttonBackgroundColorDisabled;
+//                if(button.enabled) parent.color = Style.buttonBackgroundColor;
+//                else parent.color = Style.buttonBackgroundColorDisabled;
             }
         }
     }
 
-//    Rectangle {
-//        anchors.left: parent.left
-//        anchors.right: parent.right
-//        height: parent.height - 1
-//        y: buttonArea.pressed ? 1 : 0
-//        color: {
-//            parent.enabled ? (buttonArea.pressed ? parent.pressedColor : parent.releasedColor)
-//                           : Qt.lighter(parent.releasedColor)
-
-//        }
-//        //radius: 4
-
-
-//    }
-
     Text {
         id: label
         anchors.verticalCenter: parent.verticalCenter
@@ -105,7 +87,6 @@ Item {
         font.pixelSize: buttonArea.pressed ? button.fontSize - 1 : button.fontSize
         color: parent.textColor
         visible: parent.icon === ""
-//        font.capitalization : Font.Capitalize
     }
 
     Image {
@@ -118,6 +99,7 @@ Item {
         id: buttonArea
         anchors.fill: parent
         onClicked: doClick()
+        cursorShape: Qt.PointingHandCursor
     }
 
     Keys.onSpacePressed: doClick()
diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml
index 9d9766d9..7c9315d5 100644
--- a/components/StandardDialog.qml
+++ b/components/StandardDialog.qml
@@ -140,10 +140,6 @@ Rectangle {
 
             MoneroComponents.StandardButton {
                 id: cancelButton
-                shadowReleasedColor: "#FF4304"
-                shadowPressedColor: "#B32D00"
-                releasedColor: "#FF6C3C"
-                pressedColor: "#FF4304"
                 text: qsTr("Cancel") + translationManager.emptyString
                 onClicked: {
                     root.close()
@@ -153,10 +149,6 @@ Rectangle {
 
             MoneroComponents.StandardButton {
                 id: okButton
-                shadowReleasedColor: "#FF4304"
-                shadowPressedColor: "#B32D00"
-                releasedColor: "#FF6C3C"
-                pressedColor: "#FF4304"
                 text: qsTr("OK")
                 KeyNavigation.tab: cancelButton
                 onClicked: {