diff --git a/components/NewPasswordDialog.qml b/components/NewPasswordDialog.qml
index bcf1d0c8..173fe170 100644
--- a/components/NewPasswordDialog.qml
+++ b/components/NewPasswordDialog.qml
@@ -32,6 +32,7 @@ import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
import QtQuick.Controls.Styles 1.4
import QtQuick.Window 2.0
+import FontAwesome 1.0
import "../components" as MoneroComponents
@@ -136,15 +137,16 @@ Item {
border.width: 1
color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
- Image {
- width: 26
- height: 26
+ MoneroComponents.Label {
+ fontSize: 20
+ text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
opacity: 0.7
- fillMode: Image.PreserveAspectFit
- source: isHidden ? "qrc:///images/eyeShow.png" : "qrc:///images/eyeHide.png"
- anchors.verticalCenter: parent.verticalCenter
+ fontFamily: FontAwesome.fontFamily
anchors.right: parent.right
- anchors.rightMargin: 20
+ anchors.rightMargin: 15
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.verticalCenterOffset: 1
+
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
@@ -154,13 +156,11 @@ Item {
}
onEntered: {
parent.opacity = 0.9
- parent.width = 28
- parent.height = 28
+ parent.fontSize = 24
}
onExited: {
parent.opacity = 0.7
- parent.width = 26
- parent.height = 26
+ parent.fontSize = 20
}
}
}
@@ -214,15 +214,15 @@ Item {
border.width: 1
color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
- Image {
- width: 26
- height: 26
+ MoneroComponents.Label {
+ fontSize: 20
+ text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
opacity: 0.7
- fillMode: Image.PreserveAspectFit
- source: isHidden ? "qrc:///images/eyeShow.png" : "qrc:///images/eyeHide.png"
- anchors.verticalCenter: parent.verticalCenter
+ fontFamily: FontAwesome.fontFamily
anchors.right: parent.right
- anchors.rightMargin: 20
+ anchors.rightMargin: 15
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.verticalCenterOffset: 1
MouseArea {
anchors.fill: parent
@@ -233,13 +233,11 @@ Item {
}
onEntered: {
parent.opacity = 0.9
- parent.width = 28
- parent.height = 28
+ parent.fontSize = 24
}
onExited: {
parent.opacity = 0.7
- parent.width = 26
- parent.height = 26
+ parent.fontSize = 20
}
}
}
diff --git a/components/PassphraseDialog.qml b/components/PassphraseDialog.qml
index f8ae19e5..9ae57db4 100644
--- a/components/PassphraseDialog.qml
+++ b/components/PassphraseDialog.qml
@@ -32,6 +32,7 @@ import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
import QtQuick.Controls.Styles 1.4
import QtQuick.Window 2.0
+import FontAwesome 1.0
import "../components" as MoneroComponents
@@ -170,15 +171,16 @@ Item {
border.width: 1
color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
- Image {
- width: 26
- height: 26
+ MoneroComponents.Label {
+ fontSize: 20
+ text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
opacity: 0.7
- fillMode: Image.PreserveAspectFit
- source: isHidden ? "qrc:///images/eyeShow.png" : "qrc:///images/eyeHide.png"
- anchors.verticalCenter: parent.verticalCenter
+ fontFamily: FontAwesome.fontFamily
anchors.right: parent.right
- anchors.rightMargin: 20
+ anchors.rightMargin: 15
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.verticalCenterOffset: 1
+
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
@@ -188,13 +190,11 @@ Item {
}
onEntered: {
parent.opacity = 0.9
- parent.width = 28
- parent.height = 28
+ parent.fontSize = 24
}
onExited: {
parent.opacity = 0.7
- parent.width = 26
- parent.height = 26
+ parent.fontSize = 20
}
}
}
@@ -248,15 +248,16 @@ Item {
border.width: 1
color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
- Image {
- width: 26
- height: 26
+ MoneroComponents.Label {
+ fontSize: 20
+ text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
opacity: 0.7
- fillMode: Image.PreserveAspectFit
- source: isHidden ? "qrc:///images/eyeShow.png" : "qrc:///images/eyeHide.png"
- anchors.verticalCenter: parent.verticalCenter
+ fontFamily: FontAwesome.fontFamily
anchors.right: parent.right
- anchors.rightMargin: 20
+ anchors.rightMargin: 15
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.verticalCenterOffset: 1
+
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
@@ -266,13 +267,11 @@ Item {
}
onEntered: {
parent.opacity = 0.9
- parent.width = 28
- parent.height = 28
+ parent.fontSize = 24
}
onExited: {
parent.opacity = 0.7
- parent.width = 26
- parent.height = 26
+ parent.fontSize = 20
}
}
}
diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml
index 717d4b85..4d1c8467 100644
--- a/components/PasswordDialog.qml
+++ b/components/PasswordDialog.qml
@@ -32,6 +32,7 @@ import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
import QtQuick.Controls.Styles 1.4
import QtQuick.Window 2.0
+import FontAwesome 1.0
import "." as MoneroComponents
import "effects/" as MoneroEffects
@@ -161,15 +162,15 @@ Item {
whiteColor: "#A9FFFFFF"
}
- Image {
- width: 26
- height: 26
+ MoneroComponents.Label {
+ fontSize: 20
+ text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
opacity: 0.7
- fillMode: Image.PreserveAspectFit
- source: isHidden ? "qrc:///images/eyeShow.png" : "qrc:///images/eyeHide.png"
- anchors.verticalCenter: parent.verticalCenter
+ fontFamily: FontAwesome.fontFamily
anchors.right: parent.right
- anchors.rightMargin: 20
+ anchors.rightMargin: 15
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.verticalCenterOffset: 1
MouseArea {
anchors.fill: parent
@@ -181,13 +182,11 @@ Item {
}
onEntered: {
parent.opacity = 0.9
- parent.width = 28
- parent.height = 28
+ parent.fontSize = 24
}
onExited: {
parent.opacity = 0.7
- parent.width = 26
- parent.height = 26
+ parent.fontSize = 20
}
}
}
diff --git a/images/eyeHide.png b/images/eyeHide.png
deleted file mode 100644
index e0883127..00000000
Binary files a/images/eyeHide.png and /dev/null differ
diff --git a/images/eyeHide@2x.png b/images/eyeHide@2x.png
deleted file mode 100644
index dd709e9e..00000000
Binary files a/images/eyeHide@2x.png and /dev/null differ
diff --git a/images/eyeShow.png b/images/eyeShow.png
deleted file mode 100644
index a54cef06..00000000
Binary files a/images/eyeShow.png and /dev/null differ
diff --git a/images/eyeShow@2x.png b/images/eyeShow@2x.png
deleted file mode 100644
index 4e2f4914..00000000
Binary files a/images/eyeShow@2x.png and /dev/null differ
diff --git a/qml.qrc b/qml.qrc
index cbd65822..883296cb 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -180,10 +180,6 @@
components/WarningBox.qml
images/miningxmr.png
images/miningxmr@2x.png
- images/eyeHide.png
- images/eyeHide@2x.png
- images/eyeShow.png
- images/eyeShow@2x.png
images/plus-in-circle-medium-white.png
images/plus-in-circle-medium-white@2x.png
pages/merchant/Merchant.qml