aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal/assets
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-04-21 06:57:57 +0800
committerobscuren <geffobscura@gmail.com>2014-04-21 06:57:57 +0800
commit6d5d539a859cae43a1e97acd6fc5675d45b09063 (patch)
tree4c8e1735723a359424aecd4e4652ed1429d7d12f /ethereal/assets
parenta0c97b663dcb8de940c17479877e3165834f0c8a (diff)
downloadgo-tangerine-6d5d539a859cae43a1e97acd6fc5675d45b09063.tar
go-tangerine-6d5d539a859cae43a1e97acd6fc5675d45b09063.tar.gz
go-tangerine-6d5d539a859cae43a1e97acd6fc5675d45b09063.tar.bz2
go-tangerine-6d5d539a859cae43a1e97acd6fc5675d45b09063.tar.lz
go-tangerine-6d5d539a859cae43a1e97acd6fc5675d45b09063.tar.xz
go-tangerine-6d5d539a859cae43a1e97acd6fc5675d45b09063.tar.zst
go-tangerine-6d5d539a859cae43a1e97acd6fc5675d45b09063.zip
Round one HTML external applications using QML(Qt5) WebKit2 w/o native bindings
Diffstat (limited to 'ethereal/assets')
-rw-r--r--ethereal/assets/qml/wallet.qml7
1 files changed, 6 insertions, 1 deletions
diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml
index 37224c7b4..ed06f3518 100644
--- a/ethereal/assets/qml/wallet.qml
+++ b/ethereal/assets/qml/wallet.qml
@@ -18,11 +18,13 @@ ApplicationWindow {
MenuBar {
Menu {
title: "File"
+ /*
MenuItem {
text: "Import App"
shortcut: "Ctrl+o"
onTriggered: openAppDialog.open()
}
+ */
}
Menu {
@@ -240,7 +242,10 @@ ApplicationWindow {
id: openAppDialog
title: "Open QML Application"
onAccepted: {
- ui.open(openAppDialog.fileUrl.toString())
+ //ui.open(openAppDialog.fileUrl.toString())
+ //ui.openHtml(Qt.resolvedUrl(ui.assetPath("test.html")))
+ ui.openHtml(openAppDialog.fileUrl.toString())
+
}
}