github
/
monero-gui
mirror of https://github.com/monero-project/monero-gui
1
Fork 0
Code Releases Activity

PasswordDialog: configurable Ok btn text/icon, non-primary Cancel 

Co-authored-by: rating89us <45968869+rating89us@users.noreply.github.com>
This commit is contained in:
xiphon 2020-09-24 14:08:33 +00:00
parent 98ce87a572
commit be1f63f93d
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/PasswordDialog.qml
View File

@ -44,6 +44,8 @@ Item {
property alias password: passwordInput1.text
property string walletName
property var okButtonText
property string okButtonIcon
property string errorText
property bool passwordDialogMode
property bool passphraseDialogMode
@ -75,10 +77,12 @@ Item {
appWindow.updateBalance();
}
function open(walletName, errorText) {
function open(walletName, errorText, okButtonText, okButtonIcon) {
passwordDialogMode = true;
passphraseDialogMode = false;
newPasswordDialogMode = false;
root.okButtonText = okButtonText;
root.okButtonIcon = okButtonIcon ? okButtonIcon : "";
_openInit(walletName, errorText);
}
@ -274,6 +278,7 @@ Item {
MoneroComponents.StandardButton {
id: cancelButton
primary: false
small: true
text: qsTr("Cancel") + translationManager.emptyString
KeyNavigation.tab: passwordInput1
@ -282,8 +287,10 @@ Item {
MoneroComponents.StandardButton {
id: okButton
fontAwesomeIcon: true
rightIcon: okButtonIcon
small: true
text: qsTr("Ok") + translationManager.emptyString
text: okButtonText ? okButtonText : qsTr("Ok") + translationManager.emptyString
KeyNavigation.tab: cancelButton
enabled: (passwordDialogMode == true) ? true : passwordInput1.text === passwordInput2.text
onClicked: onOk()

15
components/StandardButton.qml
View File

@ -29,10 +29,13 @@
import QtQuick 2.9
import QtQuick.Layouts 1.1
import FontAwesome 1.0
import "../components" as MoneroComponents
Item {
id: button
property bool fontAwesomeIcon: false
property bool primary: true
property string rightIcon: ""
property string rightIconInactive: ""
@ -135,7 +138,7 @@ Item {
}
Image {
visible: button.rightIcon !== ""
visible: !fontAwesomeIcon && button.rightIcon !== ""
Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
width: button.small ? 16 : 20
height: button.small ? 16 : 20
@ -146,6 +149,16 @@ Item {
return button.rightIcon;
}
}
Text {
Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
color: MoneroComponents.Style.defaultFontColor
font.family: FontAwesome.fontFamilySolid
font.pixelSize: button.small ? 16 : 20
font.styleName: "Solid"
text: button.rightIcon
visible: fontAwesomeIcon && button.rightIcon !== ""
}
}
MouseArea {

8
main.qml
View File

@ -33,6 +33,8 @@ import QtQuick.Controls.Styles 1.1
import QtQuick.Dialogs 1.2
import QtGraphicalEffects 1.0
import FontAwesome 1.0
import moneroComponents.Network 1.0
import moneroComponents.Wallet 1.0
import moneroComponents.WalletManager 1.0
@ -1487,7 +1489,11 @@ ApplicationWindow {
if(!persistentSettings.askPasswordBeforeSending) {
handleAccepted()
} else {
passwordDialog.open()
passwordDialog.open(
"",
"",
(appWindow.viewOnly ? qsTr("Save transaction file") : qsTr("Send transaction")) + translationManager.emptyString,
appWindow.viewOnly ? "" : FontAwesome.arrowCircleRight);
}
}
}