diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-04-23 15:34:24 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-04-23 15:34:24 -0500 |
| commit | 358e1d23facbd10fefbb2bf04c45b98f0c728ad0 (patch) | |
| tree | e6a4d56120b5353c3d138593469e4e01793a98fa /pages | |
| parent | ba0f7fc9f62467d1b95ef40adf849c6e4484fccd (diff) | |
| parent | 7b7996dc66b65bf8e42315da13aa188c6a927282 (diff) | |
| download | monzero-gui-358e1d23facbd10fefbb2bf04c45b98f0c728ad0.tar.gz monzero-gui-358e1d23facbd10fefbb2bf04c45b98f0c728ad0.tar.xz monzero-gui-358e1d23facbd10fefbb2bf04c45b98f0c728ad0.zip | |
Merge pull request #2106
7b7996d qrcodescanner: update icon with font awesome (mmbyday)
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/AddressBook.qml | 7 | ||||
| -rw-r--r-- | pages/Transfer.qml | 8 |
2 files changed, 11 insertions, 4 deletions
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" |