monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 00:07:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2376

Browse source 
5f81b57 TitleBar: show wallet name (selsta)
This commit is contained in:
luigi1111 2019-09-14 12:42:51 -05:00
commit 120a62257f
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/TitleBar.qml
View file

@ -43,6 +43,7 @@ Rectangle {
property bool showMinimizeButton: true property bool showMinimizeButton: true
property bool showMaximizeButton: true property bool showMaximizeButton: true
property bool showCloseButton: true property bool showCloseButton: true
property string walletName: ""
height: { height: {
if(!persistentSettings.customDecorations || isMobile) return 0; if(!persistentSettings.customDecorations || isMobile) return 0;
@ -191,6 +192,7 @@ Rectangle {
// monero logo // monero logo
Item { Item {
visible: walletName.length === 0
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: parent.height Layout.preferredHeight: parent.height
@ -218,6 +220,22 @@ Rectangle {
} }
} }
Item {
visible: walletName.length > 0
Layout.fillWidth: true
Layout.preferredHeight: parent.height
MoneroComponents.TextPlain {
font.pixelSize: 20
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
width: parent.width
height: parent.height
elide: Text.ElideRight
text: walletName
}
}
// minimize // minimize
Rectangle { Rectangle {
color: "transparent" color: "transparent"

2
main.qml
View file

@ -296,6 +296,7 @@ ApplicationWindow {
middlePanel.getProofClicked.disconnect(handleGetProof); middlePanel.getProofClicked.disconnect(handleGetProof);
middlePanel.checkProofClicked.disconnect(handleCheckProof); middlePanel.checkProofClicked.disconnect(handleCheckProof);
appWindow.walletName = "";
currentWallet = undefined; currentWallet = undefined;
appWindow.showProcessingSplash(qsTr("Closing wallet...")); appWindow.showProcessingSplash(qsTr("Closing wallet..."));
@ -1911,6 +1912,7 @@ ApplicationWindow {
TitleBar { TitleBar {
id: titleBar id: titleBar
visible: persistentSettings.customDecorations && middlePanel.state !== "Merchant" visible: persistentSettings.customDecorations && middlePanel.state !== "Merchant"
walletName: appWindow.walletName
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
onCloseClicked: appWindow.close(); onCloseClicked: appWindow.close();