From fbd5e4d5afeaff6c250a3a953b18476cdb4b86ae Mon Sep 17 00:00:00 2001 From: Alexandre Van de Sande Date: Tue, 17 Feb 2015 11:52:22 +0100 Subject: Updated icons --- cmd/mist/assets/miner.png | Bin 2100 -> 0 bytes cmd/mist/assets/mining-icon.png | Bin 0 -> 1029 bytes cmd/mist/assets/mining-icon@2x.png | Bin 0 -> 2312 bytes cmd/mist/assets/qml/main.qml | 4 ++-- cmd/mist/assets/qml/views/miner.qml | 2 +- cmd/mist/assets/qml/views/wallet.qml | 1 - 6 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 cmd/mist/assets/miner.png create mode 100644 cmd/mist/assets/mining-icon.png create mode 100644 cmd/mist/assets/mining-icon@2x.png diff --git a/cmd/mist/assets/miner.png b/cmd/mist/assets/miner.png deleted file mode 100644 index 58e3f4dfe..000000000 Binary files a/cmd/mist/assets/miner.png and /dev/null differ diff --git a/cmd/mist/assets/mining-icon.png b/cmd/mist/assets/mining-icon.png new file mode 100644 index 000000000..db611e5c0 Binary files /dev/null and b/cmd/mist/assets/mining-icon.png differ diff --git a/cmd/mist/assets/mining-icon@2x.png b/cmd/mist/assets/mining-icon@2x.png new file mode 100644 index 000000000..16466d338 Binary files /dev/null and b/cmd/mist/assets/mining-icon@2x.png differ diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml index 0a8776345..9a6bf5273 100644 --- a/cmd/mist/assets/qml/main.qml +++ b/cmd/mist/assets/qml/main.qml @@ -41,12 +41,12 @@ ApplicationWindow { Component.onCompleted: { catalog = addPlugin("./views/catalog.qml", {noAdd: true, close: false, section: "begin", active: true}); - var wallet = addPlugin("./views/wallet.qml", {noAdd: true, close: false, section: "ethereum"}); var walletWeb = addPlugin("./views/browser.qml", {noAdd: true, close: false, section: "ethereum", active: false}); walletWeb.view.url = "http://ethereum-dapp-wallet.meteor.com/"; walletWeb.menuItem.title = "Wallet"; - + + addPlugin("./views/wallet.qml", {noAdd: true, close: false, section: "legacy"}); addPlugin("./views/miner.qml", {noAdd: true, close: false, section: "ethereum", active: false}); addPlugin("./views/transaction.qml", {noAdd: true, close: false, section: "legacy"}); addPlugin("./views/whisper.qml", {noAdd: true, close: false, section: "legacy"}); diff --git a/cmd/mist/assets/qml/views/miner.qml b/cmd/mist/assets/qml/views/miner.qml index 6a199a925..e239c7d7b 100644 --- a/cmd/mist/assets/qml/views/miner.qml +++ b/cmd/mist/assets/qml/views/miner.qml @@ -9,7 +9,7 @@ import Ethereum 1.0 Rectangle { id: root property var title: "Miner" - property var iconSource: "../miner.png" + property var iconSource: "../mining-icon.png" property var menuItem color: "#00000000" diff --git a/cmd/mist/assets/qml/views/wallet.qml b/cmd/mist/assets/qml/views/wallet.qml index 59dbae848..2369390c3 100644 --- a/cmd/mist/assets/qml/views/wallet.qml +++ b/cmd/mist/assets/qml/views/wallet.qml @@ -9,7 +9,6 @@ import Ethereum 1.0 Rectangle { id: root property var title: "Wallet" - property var iconSource: "../facet.png" property var menuItem objectName: "walletView" -- cgit