Merge pull request #2106

7b7996d qrcodescanner: update icon with font awesome (mmbyday)

7 files changed, 18 insertions, 12 deletions

diff --git a/components/InlineButton.qml b/components/InlineButton.qml
index e894e14d..4741a701 100644
--- a/components/InlineButton.qml
+++ b/components/InlineButton.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
@@ -43,11 +43,13 @@ Item {
     property string pressedColor: "#FF4304"
     property string releasedColor: "#FF6C3C"
     property string icon: ""
-    property string textColor: "#FFFFFF"
+    property string textColor: "black"
     property int fontSize: small ? 14 * scaleRatio : 16 * scaleRatio
     property int rectHeight: small ? 24 * scaleRatio : 28 * scaleRatio
     property int rectHMargin: small ? 16 * scaleRatio : 22 * scaleRatio
     property alias text: inlineText.text
+    property alias fontPixelSize: inlineText.font.pixelSize
+    property alias fontFamily: inlineText.font
     property alias buttonColor: rect.color
     signal clicked()
 
@@ -73,7 +75,7 @@ Item {
             font.family: MoneroComponents.Style.fontBold.name
             font.bold: true
             font.pixelSize: inlineButton.fontSize
-            color: "black"
+            color: inlineButton.textColor
             anchors.verticalCenter: parent.verticalCenter
             anchors.horizontalCenter: parent.horizontalCenter
         }
diff --git a/components/LineEditMulti.qml b/components/LineEditMulti.qml
index e28d9e75..3689ad39 100644
--- a/components/LineEditMulti.qml
+++ b/components/LineEditMulti.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
@@ -201,8 +201,7 @@ ColumnLayout {
             visible: (inlineButtonId.text || inlineButtonId.icon) && inlineButtonVisible ? true : false
             anchors.right: parent.right
             anchors.rightMargin: 8 * scaleRatio
-            anchors.top: parent.top
-            anchors.topMargin: 4 * scaleRatio
+            anchors.verticalCenter: parent.verticalCenter
         }
     }
 }
diff --git a/images/qr.png b/images/qr.png
deleted file mode 100644
index 017f523b..00000000
--- a/images/qr.png
+++ /dev/null
diff --git a/images/qr@2x.png b/images/qr@2x.png
deleted file mode 100644
index 36b8e479..00000000
--- a/images/qr@2x.png
+++ /dev/null
diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml
index 201e644c..19ff9c95 100644
--- a/pages/AddressBook.qml
+++ b/pages/AddressBook.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -306,7 +306,10 @@ Rectangle {
                         addressLine.text = clipboardText;
                     }
                 }
-                inlineButton.icon: "../images/qr.png"
+                inlineButton.text: FontAwesome.qrcode
+                inlineButton.fontPixelSize: 22
+                inlineButton.fontFamily: FontAwesome.fontFamily
+                inlineButton.textColor: MoneroComponents.Style.defaultFontColor
                 inlineButton.buttonColor: MoneroComponents.Style.orange
                 inlineButton.onClicked: {
                     cameraUi.state = "Capture"
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index 0f19c495..4fcf193d 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -33,6 +33,7 @@ import moneroComponents.Clipboard 1.0
 import moneroComponents.PendingTransaction 1.0
 import moneroComponents.Wallet 1.0
 import moneroComponents.NetworkType 1.0
+import FontAwesome 1.0
 import "../components"
 import "../components" as MoneroComponents
 import "." 1.0
@@ -246,7 +247,10 @@ Rectangle {
                      addressLine.text = clipboardText; 
                   }
               }
-              inlineButton.icon: "../images/qr.png"
+              inlineButton.text: FontAwesome.qrcode
+              inlineButton.fontPixelSize: 22
+              inlineButton.fontFamily: FontAwesome.fontFamily
+              inlineButton.textColor: MoneroComponents.Style.defaultFontColor
               inlineButton.buttonColor: MoneroComponents.Style.orange
               inlineButton.onClicked: {
                   cameraUi.state = "Capture"
diff --git a/qml.qrc b/qml.qrc
index 630a4ea3..c3ec2223 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -183,8 +183,6 @@
         <file>components/RadioButton.qml</file>
         <file>images/editIcon.png</file>
         <file>images/editIcon@2x.png</file>
-        <file>images/qr.png</file>
-        <file>images/qr@2x.png</file>
         <file>pages/settings/Settings.qml</file>
         <file>pages/settings/SettingsWallet.qml</file>
         <file>pages/settings/SettingsNode.qml</file>