aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorAlexandre Van de Sande <alex.vandesande@ethdev.com>2015-02-17 18:52:22 +0800
committerAlexandre Van de Sande <alex.vandesande@ethdev.com>2015-02-17 18:52:22 +0800
commitfbd5e4d5afeaff6c250a3a953b18476cdb4b86ae (patch)
tree305c4d211bc05be111675cb24e4fc8702da80437 /cmd
parent0de1d1dd588266961740b598da4e01e5efdf2d1f (diff)
downloaddexon-fbd5e4d5afeaff6c250a3a953b18476cdb4b86ae.tar
dexon-fbd5e4d5afeaff6c250a3a953b18476cdb4b86ae.tar.gz
dexon-fbd5e4d5afeaff6c250a3a953b18476cdb4b86ae.tar.bz2
dexon-fbd5e4d5afeaff6c250a3a953b18476cdb4b86ae.tar.lz
dexon-fbd5e4d5afeaff6c250a3a953b18476cdb4b86ae.tar.xz
dexon-fbd5e4d5afeaff6c250a3a953b18476cdb4b86ae.tar.zst
dexon-fbd5e4d5afeaff6c250a3a953b18476cdb4b86ae.zip
Updated icons
Diffstat (limited to 'cmd')
-rw-r--r--cmd/mist/assets/miner.pngbin2100 -> 0 bytes
-rw-r--r--cmd/mist/assets/mining-icon.pngbin0 -> 1029 bytes
-rw-r--r--cmd/mist/assets/mining-icon@2x.pngbin0 -> 2312 bytes
-rw-r--r--cmd/mist/assets/qml/main.qml4
-rw-r--r--cmd/mist/assets/qml/views/miner.qml2
-rw-r--r--cmd/mist/assets/qml/views/wallet.qml1
6 files changed, 3 insertions, 4 deletions
diff --git a/cmd/mist/assets/miner.png b/cmd/mist/assets/miner.png
deleted file mode 100644
index 58e3f4dfe..000000000
--- a/cmd/mist/assets/miner.png
+++ /dev/null
Binary files differ
diff --git a/cmd/mist/assets/mining-icon.png b/cmd/mist/assets/mining-icon.png
new file mode 100644
index 000000000..db611e5c0
--- /dev/null
+++ b/cmd/mist/assets/mining-icon.png
Binary files 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
--- /dev/null
+++ b/cmd/mist/assets/mining-icon@2x.png
Binary files 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"