diff options
| author | obscuren <geffobscura@gmail.com> | 2014-07-11 03:54:46 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-07-11 03:54:46 +0800 |
| commit | fc8bd7229ee25e214130df98875ecc13e4650911 (patch) | |
| tree | 4938ae8de73d99a20bba9999103b381e52519e66 /ethereal/assets | |
| parent | 685aebc72e9d5fc3fde275961709c4496fdb73cd (diff) | |
| parent | c2bca5939d1d78d1548fcd43c29390fb06a508c0 (diff) | |
| download | go-tangerine-fc8bd7229ee25e214130df98875ecc13e4650911.tar go-tangerine-fc8bd7229ee25e214130df98875ecc13e4650911.tar.gz go-tangerine-fc8bd7229ee25e214130df98875ecc13e4650911.tar.bz2 go-tangerine-fc8bd7229ee25e214130df98875ecc13e4650911.tar.lz go-tangerine-fc8bd7229ee25e214130df98875ecc13e4650911.tar.xz go-tangerine-fc8bd7229ee25e214130df98875ecc13e4650911.tar.zst go-tangerine-fc8bd7229ee25e214130df98875ecc13e4650911.zip | |
Merge branch 'develop'
Diffstat (limited to 'ethereal/assets')
| -rw-r--r-- | ethereal/assets/qml/wallet.qml | 12 | ||||
| -rw-r--r-- | ethereal/assets/qml/webapp.qml | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index 4b252f200..c783cde83 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/ethereal/assets/qml/wallet.qml @@ -100,7 +100,7 @@ ApplicationWindow { anchors.right: parent.right height: 200 Image { - source: ui.assetPath("tx.png") + source: "../tx.png" anchors.horizontalCenter: parent.horizontalCenter MouseArea { anchors.fill: parent @@ -110,7 +110,7 @@ ApplicationWindow { } } Image { - source: ui.assetPath("new.png") + source: "../new.png" anchors.horizontalCenter: parent.horizontalCenter MouseArea { anchors.fill: parent @@ -120,7 +120,7 @@ ApplicationWindow { } } Image { - source: ui.assetPath("net.png") + source: "../net.png" anchors.horizontalCenter: parent.horizontalCenter MouseArea { anchors.fill: parent @@ -131,7 +131,7 @@ ApplicationWindow { } Image { - source: ui.assetPath("heart.png") + source: "../heart.png" anchors.horizontalCenter: parent.horizontalCenter MouseArea { anchors.fill: parent @@ -436,7 +436,7 @@ ApplicationWindow { onDoubleClicked: peerWindow.visible = true anchors.fill: parent } - source: ui.assetPath("network.png") + source: "../network.png" } } @@ -624,7 +624,7 @@ ApplicationWindow { width: 150 fillMode: Image.PreserveAspectFit smooth: true - source: ui.assetPath("facet.png") + source: "../facet.png" x: 10 y: 10 } diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml index 63927f0eb..401267511 100644 --- a/ethereal/assets/qml/webapp.qml +++ b/ethereal/assets/qml/webapp.qml @@ -38,7 +38,7 @@ ApplicationWindow { experimental.preferences.javascriptEnabled: true experimental.preferences.navigatorQtObjectEnabled: true experimental.preferences.developerExtrasEnabled: true - experimental.userScripts: [ui.assetPath("ext/pre.js"), ui.assetPath("ext/big.js"), ui.assetPath("ext/string.js"), ui.assetPath("ext/ethereum.js")] + experimental.userScripts: ["../ext/pre.js", "../ext/big.js", "../ext/string.js", "../ext/ethereum.js"] experimental.onMessageReceived: { console.log("[onMessageReceived]: ", message.data) // TODO move to messaging.js |