diff options
| author | JoeG <joegoulden@gmail.com> | 2014-09-19 04:41:45 +0800 |
|---|---|---|
| committer | JoeG <joegoulden@gmail.com> | 2014-09-19 04:41:45 +0800 |
| commit | a96c5986c5216b1238decde40bc6c6882da81996 (patch) | |
| tree | 25ffbdcca995473c05ff780698439e2192597296 /Mist/assets | |
| parent | b27100c8fc48c819c9e6a6b76fcc50cfe118cedb (diff) | |
| parent | 728005722853028348909e1d458593415cb52660 (diff) | |
| download | go-tangerine-a96c5986c5216b1238decde40bc6c6882da81996.tar.gz go-tangerine-a96c5986c5216b1238decde40bc6c6882da81996.tar.zst go-tangerine-a96c5986c5216b1238decde40bc6c6882da81996.zip | |
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
Mist/assets/qml/wallet.qml
Diffstat (limited to 'Mist/assets')
| -rw-r--r-- | Mist/assets/qml/views/wallet.qml | 2 | ||||
| -rw-r--r-- | Mist/assets/qml/wallet.qml | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/Mist/assets/qml/views/wallet.qml b/Mist/assets/qml/views/wallet.qml index 2a766bb5b..fbe1dfd0e 100644 --- a/Mist/assets/qml/views/wallet.qml +++ b/Mist/assets/qml/views/wallet.qml @@ -9,7 +9,7 @@ import Ethereum 1.0 Rectangle { id: root property var title: "Wallet" - property var iconSource: "../wallet.png" + property var iconSource: "../facet.png" property var menuItem objectName: "walletView" diff --git a/Mist/assets/qml/wallet.qml b/Mist/assets/qml/wallet.qml index 50cac0520..0e3d321f4 100644 --- a/Mist/assets/qml/wallet.qml +++ b/Mist/assets/qml/wallet.qml @@ -101,16 +101,16 @@ ApplicationWindow { } } - menuBar: MenuBar { - Menu { - title: "File" - MenuItem { - text: "Import App" - shortcut: "Ctrl+o" - onTriggered: { - generalFileDialog.show(true, importApp) - } - } + menuBar: MenuBar { + Menu { + title: "File" + MenuItem { + text: "Import App" + shortcut: "Ctrl+o" + onTriggered: { + generalFileDialog.show(true, importApp) + } + } /* MenuItem { |