diff options
| author | zelig <viktor.tron@gmail.com> | 2014-06-25 23:20:26 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-06-25 23:20:26 +0800 |
| commit | 08de13a57b4a59fc4a8ccf9e707ede57cc380a0c (patch) | |
| tree | 94bd0dc4887284c6e0ae57a7b40825dae52eee0e /ethereal/assets/qml/wallet.qml | |
| parent | 6f09a3e8200ba2eeeeb296141d6644d04078a9c4 (diff) | |
| parent | 9654b809120d1cc3c53ffe268fe47869ef0dc0a8 (diff) | |
| download | go-tangerine-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar go-tangerine-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar.gz go-tangerine-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar.bz2 go-tangerine-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar.lz go-tangerine-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar.xz go-tangerine-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar.zst go-tangerine-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.zip | |
merge upstream
Diffstat (limited to 'ethereal/assets/qml/wallet.qml')
| -rw-r--r-- | ethereal/assets/qml/wallet.qml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index a7c03f6d1..454d0f3f0 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/ethereal/assets/qml/wallet.qml @@ -372,7 +372,15 @@ ApplicationWindow { onAccepted: { //ui.open(openAppDialog.fileUrl.toString()) //ui.openHtml(Qt.resolvedUrl(ui.assetPath("test.html"))) - ui.openHtml(openAppDialog.fileUrl.toString()) + var path = openAppDialog.fileUrl.toString() + console.log(path) + var ext = path.split('.').pop() + console.log(ext) + if(ext == "html" || ext == "htm") { + ui.openHtml(path) + }else if(ext == "qml"){ + ui.openQml(path) + } } } |