diff options
| author | obscuren <geffobscura@gmail.com> | 2014-06-27 01:54:09 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-06-27 01:54:09 +0800 |
| commit | 3777ead25e1acedc0571a48a485976eb5c36fb30 (patch) | |
| tree | 38419590b42a20a51773e178acbbb3178ee89bf2 /ethereal/assets/qml/wallet.qml | |
| parent | cba47963113d8041281278d75ee0dad046798e82 (diff) | |
| parent | a68bfd215f7b1859c1b14b0df59f3260b35df828 (diff) | |
| download | go-tangerine-3777ead25e1acedc0571a48a485976eb5c36fb30.tar go-tangerine-3777ead25e1acedc0571a48a485976eb5c36fb30.tar.gz go-tangerine-3777ead25e1acedc0571a48a485976eb5c36fb30.tar.bz2 go-tangerine-3777ead25e1acedc0571a48a485976eb5c36fb30.tar.lz go-tangerine-3777ead25e1acedc0571a48a485976eb5c36fb30.tar.xz go-tangerine-3777ead25e1acedc0571a48a485976eb5c36fb30.tar.zst go-tangerine-3777ead25e1acedc0571a48a485976eb5c36fb30.zip | |
Merge branch 'release/0.5.15'0.5.15
Diffstat (limited to 'ethereal/assets/qml/wallet.qml')
| -rw-r--r-- | ethereal/assets/qml/wallet.qml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index a7c03f6d1..84f8fd5cf 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/ethereal/assets/qml/wallet.qml @@ -319,7 +319,7 @@ ApplicationWindow { Slider { id: logLevelSlider - value: 1 + value: eth.getLogLevelInt() anchors { right: parent.right top: parent.top @@ -332,7 +332,7 @@ ApplicationWindow { } orientation: Qt.Vertical - maximumValue: 3 + maximumValue: 5 stepSize: 1 onValueChanged: { @@ -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) + } } } |