aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal/assets
diff options
context:
space:
mode:
Diffstat (limited to 'ethereal/assets')
-rw-r--r--ethereal/assets/debugger/debugger.qml6
-rw-r--r--ethereal/assets/qml/wallet.qml12
-rw-r--r--ethereal/assets/qml/webapp.qml5
3 files changed, 12 insertions, 11 deletions
diff --git a/ethereal/assets/debugger/debugger.qml b/ethereal/assets/debugger/debugger.qml
index f204647c8..fa56737a2 100644
--- a/ethereal/assets/debugger/debugger.qml
+++ b/ethereal/assets/debugger/debugger.qml
@@ -19,7 +19,7 @@ ApplicationWindow {
property alias dataText: rawDataField.text
onClosing: {
- compileTimer.stop()
+ //compileTimer.stop()
}
MenuBar {
@@ -112,13 +112,15 @@ ApplicationWindow {
anchors.right: settings.left
focus: true
+ /*
Timer {
id: compileTimer
interval: 500 ; running: true ; repeat: true
onTriggered: {
- dbg.compile(codeEditor.text)
+ dbg.autoComp(codeEditor.text)
}
}
+ */
}
Column {
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..5e4c035d8 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
@@ -191,6 +191,7 @@ ApplicationWindow {
inspector.visible = false
}else{
inspector.visible = true
+ inspector.url = webview.experimental.remoteInspectorUrl
}
}
onDoubleClicked: {
@@ -224,7 +225,6 @@ ApplicationWindow {
WebView {
id: inspector
visible: false
- url: webview.experimental.remoteInspectorUrl
anchors {
left: root.left
right: root.right
@@ -238,7 +238,6 @@ ApplicationWindow {
name: "inspectorShown"
PropertyChanges {
target: inspector
- url: webview.experimental.remoteInspectorUrl
}
}
]