4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-09 19:32:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2127

Browse Source 
131c427 passworddialog: replace eye with font awesome (mmbyday)
This commit is contained in:
luigi1111 2019-04-30 15:25:59 -05:00
commit 8d9f33b5aa
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
8 changed files with 51 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
components/NewPasswordDialog.qml
View File

@ -32,6 +32,7 @@ import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Window 2.0 import QtQuick.Window 2.0
import FontAwesome 1.0
import "../components" as MoneroComponents import "../components" as MoneroComponents
@ -136,15 +137,16 @@ Item {
border.width: 1 border.width: 1
color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF" color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
Image { MoneroComponents.Label {
width: 26 fontSize: 20
height: 26 text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
opacity: 0.7 opacity: 0.7
fillMode: Image.PreserveAspectFit fontFamily: FontAwesome.fontFamily
source: isHidden ? "qrc:///images/eyeShow.png" : "qrc:///images/eyeHide.png"
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 20 anchors.rightMargin: 15
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
@ -154,13 +156,11 @@ Item {
} }
onEntered: { onEntered: {
parent.opacity = 0.9 parent.opacity = 0.9
parent.width = 28 parent.fontSize = 24
parent.height = 28
} }
onExited: { onExited: {
parent.opacity = 0.7 parent.opacity = 0.7
parent.width = 26 parent.fontSize = 20
parent.height = 26
} }
} }
} }
@ -214,15 +214,15 @@ Item {
border.width: 1 border.width: 1
color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF" color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
Image { MoneroComponents.Label {
width: 26 fontSize: 20
height: 26 text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
opacity: 0.7 opacity: 0.7
fillMode: Image.PreserveAspectFit fontFamily: FontAwesome.fontFamily
source: isHidden ? "qrc:///images/eyeShow.png" : "qrc:///images/eyeHide.png"
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 20 anchors.rightMargin: 15
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
@ -233,13 +233,11 @@ Item {
} }
onEntered: { onEntered: {
parent.opacity = 0.9 parent.opacity = 0.9
parent.width = 28 parent.fontSize = 24
parent.height = 28
} }
onExited: { onExited: {
parent.opacity = 0.7 parent.opacity = 0.7
parent.width = 26 parent.fontSize = 20
parent.height = 26
} }
} }
} }

43
components/PassphraseDialog.qml
View File

@ -32,6 +32,7 @@ import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Window 2.0 import QtQuick.Window 2.0
import FontAwesome 1.0
import "../components" as MoneroComponents import "../components" as MoneroComponents
@ -170,15 +171,16 @@ Item {
border.width: 1 border.width: 1
color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF" color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
Image { MoneroComponents.Label {
width: 26 fontSize: 20
height: 26 text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
opacity: 0.7 opacity: 0.7
fillMode: Image.PreserveAspectFit fontFamily: FontAwesome.fontFamily
source: isHidden ? "qrc:///images/eyeShow.png" : "qrc:///images/eyeHide.png"
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 20 anchors.rightMargin: 15
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
@ -188,13 +190,11 @@ Item {
} }
onEntered: { onEntered: {
parent.opacity = 0.9 parent.opacity = 0.9
parent.width = 28 parent.fontSize = 24
parent.height = 28
} }
onExited: { onExited: {
parent.opacity = 0.7 parent.opacity = 0.7
parent.width = 26 parent.fontSize = 20
parent.height = 26
} }
} }
} }
@ -248,15 +248,16 @@ Item {
border.width: 1 border.width: 1
color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF" color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
Image { MoneroComponents.Label {
width: 26 fontSize: 20
height: 26 text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
opacity: 0.7 opacity: 0.7
fillMode: Image.PreserveAspectFit fontFamily: FontAwesome.fontFamily
source: isHidden ? "qrc:///images/eyeShow.png" : "qrc:///images/eyeHide.png"
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 20 anchors.rightMargin: 15
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
@ -266,13 +267,11 @@ Item {
} }
onEntered: { onEntered: {
parent.opacity = 0.9 parent.opacity = 0.9
parent.width = 28 parent.fontSize = 24
parent.height = 28
} }
onExited: { onExited: {
parent.opacity = 0.7 parent.opacity = 0.7
parent.width = 26 parent.fontSize = 20
parent.height = 26
} }
} }
} }

21
components/PasswordDialog.qml
View File

@ -32,6 +32,7 @@ import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Window 2.0 import QtQuick.Window 2.0
import FontAwesome 1.0
import "." as MoneroComponents import "." as MoneroComponents
import "effects/" as MoneroEffects import "effects/" as MoneroEffects
@ -161,15 +162,15 @@ Item {
whiteColor: "#A9FFFFFF" whiteColor: "#A9FFFFFF"
} }
Image { MoneroComponents.Label {
width: 26 fontSize: 20
height: 26 text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
opacity: 0.7 opacity: 0.7
fillMode: Image.PreserveAspectFit fontFamily: FontAwesome.fontFamily
source: isHidden ? "qrc:///images/eyeShow.png" : "qrc:///images/eyeHide.png"
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 20 anchors.rightMargin: 15
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
@ -181,13 +182,11 @@ Item {
} }
onEntered: { onEntered: {
parent.opacity = 0.9 parent.opacity = 0.9
parent.width = 28 parent.fontSize = 24
parent.height = 28
} }
onExited: { onExited: {
parent.opacity = 0.7 parent.opacity = 0.7
parent.width = 26 parent.fontSize = 20
parent.height = 26
} }
} }
} }

BIN
images/eyeHide.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 691 B

BIN
images/eyeHide@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
images/eyeShow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 575 B

BIN
images/eyeShow@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

4
qml.qrc
View File

@ -180,10 +180,6 @@
<file>components/WarningBox.qml</file> <file>components/WarningBox.qml</file>
<file>images/miningxmr.png</file> <file>images/miningxmr.png</file>
<file>images/miningxmr@2x.png</file> <file>images/miningxmr@2x.png</file>
<file>images/eyeHide.png</file>
<file>images/eyeHide@2x.png</file>
<file>images/eyeShow.png</file>
<file>images/eyeShow@2x.png</file>
<file>images/plus-in-circle-medium-white.png</file> <file>images/plus-in-circle-medium-white.png</file>
<file>images/plus-in-circle-medium-white@2x.png</file> <file>images/plus-in-circle-medium-white@2x.png</file>
<file>pages/merchant/Merchant.qml</file> <file>pages/merchant/Merchant.qml</file>