From 131c42701c68155822d516aafc82741468c0d220 Mon Sep 17 00:00:00 2001 From: mmbyday Date: Mon, 29 Apr 2019 01:34:58 -0700 Subject: [PATCH] passworddialog: replace eye with font awesome --- components/NewPasswordDialog.qml | 42 ++++++++++++++---------------- components/PassphraseDialog.qml | 43 +++++++++++++++---------------- components/PasswordDialog.qml | 21 +++++++-------- images/eyeHide.png | Bin 691 -> 0 bytes images/eyeHide@2x.png | Bin 1364 -> 0 bytes images/eyeShow.png | Bin 575 -> 0 bytes images/eyeShow@2x.png | Bin 1191 -> 0 bytes qml.qrc | 4 --- 8 files changed, 51 insertions(+), 59 deletions(-) delete mode 100644 images/eyeHide.png delete mode 100644 images/eyeHide@2x.png delete mode 100644 images/eyeShow.png delete mode 100644 images/eyeShow@2x.png 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 e088312701a5dfffdf503d7d6cc285dc4ef87899..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 691 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/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