From 79259c916ddb7fb9bbd2515dabb84b4f9025b4e3 Mon Sep 17 00:00:00 2001 From: Maran Date: Tue, 8 Jul 2014 14:05:42 +0200 Subject: Use relative image paths to help with windows builds --- ethereal/assets/qml/wallet.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ethereal/assets') diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index 4b252f200..33e1cc24c 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 -- cgit v1.2.3 From 7f9e614b5da75b948a0ba474e37254cb3f27ef0b Mon Sep 17 00:00:00 2001 From: Maran Date: Tue, 8 Jul 2014 14:25:30 +0200 Subject: Forgot two images --- ethereal/assets/qml/wallet.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ethereal/assets') diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index 33e1cc24c..c783cde83 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/ethereal/assets/qml/wallet.qml @@ -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 } -- cgit v1.2.3 From 61d5d107b6f274cb1bf4ba6fda015ae30d28d2a6 Mon Sep 17 00:00:00 2001 From: Maran Date: Tue, 8 Jul 2014 14:27:22 +0200 Subject: Make script inclusion via QML also relative to asset path --- ethereal/assets/qml/webapp.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ethereal/assets') 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 -- cgit v1.2.3 From d3e31a4a6db6166b0639f0e9be5f70d5035baeeb Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 11 Jul 2014 16:04:27 +0200 Subject: Special diff output + debugger changes --- ethereal/assets/debugger/debugger.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ethereal/assets') diff --git a/ethereal/assets/debugger/debugger.qml b/ethereal/assets/debugger/debugger.qml index f204647c8..4d01ea183 100644 --- a/ethereal/assets/debugger/debugger.qml +++ b/ethereal/assets/debugger/debugger.qml @@ -116,7 +116,7 @@ ApplicationWindow { id: compileTimer interval: 500 ; running: true ; repeat: true onTriggered: { - dbg.compile(codeEditor.text) + dbg.autoComp(codeEditor.text) } } } -- cgit v1.2.3 From 288f1c5387c1a0a8863499389e8a7ca7e3068208 Mon Sep 17 00:00:00 2001 From: obscuren Date: Sat, 12 Jul 2014 11:02:50 +0200 Subject: Removed timer --- ethereal/assets/debugger/debugger.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ethereal/assets') diff --git a/ethereal/assets/debugger/debugger.qml b/ethereal/assets/debugger/debugger.qml index 4d01ea183..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,6 +112,7 @@ ApplicationWindow { anchors.right: settings.left focus: true + /* Timer { id: compileTimer interval: 500 ; running: true ; repeat: true @@ -119,6 +120,7 @@ ApplicationWindow { dbg.autoComp(codeEditor.text) } } + */ } Column { -- cgit v1.2.3 From e53acdc2ac45fa8953afc3392ed81653d6f26326 Mon Sep 17 00:00:00 2001 From: Maran Date: Mon, 14 Jul 2014 16:46:00 +0200 Subject: Work around race condition with qt webinspector for windows builds --- ethereal/assets/qml/webapp.qml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ethereal/assets') diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml index 401267511..5e4c035d8 100644 --- a/ethereal/assets/qml/webapp.qml +++ b/ethereal/assets/qml/webapp.qml @@ -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 } } ] -- cgit v1.2.3