mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-23 03:59:38 +00:00
Merge pull request #2127
131c427 passworddialog: replace eye with font awesome (mmbyday)This commit is contained in:
luigi1111
commit
8d9f33b5aa
8 changed files with 51 additions and 59 deletions
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 691 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 575 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
4
qml.qrc
4
qml.qrc
|
|
@ -180,10 +180,6 @@
|
|||
<file>components/WarningBox.qml</file>
|
||||
<file>images/miningxmr.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@2x.png</file>
|
||||
<file>pages/merchant/Merchant.qml</file>
|
||||
|
|
|
|||
Loading…
Reference in a new issue