diff options
| author | obscuren <geffobscura@gmail.com> | 2014-10-07 17:18:34 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-10-07 17:18:34 +0800 |
| commit | 4ed94d3d512da28407118723e05e29f4058497e0 (patch) | |
| tree | d9931e2555679a8e5c05b42b879fa43aa1dd6050 /mist/assets/qml/main.qml | |
| parent | e100aa3c6c6a9e4da858812b7ed8392ec2e3954a (diff) | |
| download | go-tangerine-4ed94d3d512da28407118723e05e29f4058497e0.tar.gz go-tangerine-4ed94d3d512da28407118723e05e29f4058497e0.tar.zst go-tangerine-4ed94d3d512da28407118723e05e29f4058497e0.zip | |
removed old windows & added websockets to mist
Diffstat (limited to 'mist/assets/qml/main.qml')
| -rw-r--r-- | mist/assets/qml/main.qml | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/mist/assets/qml/main.qml b/mist/assets/qml/main.qml index 3d9204ce8..689427228 100644 --- a/mist/assets/qml/main.qml +++ b/mist/assets/qml/main.qml @@ -51,9 +51,8 @@ ApplicationWindow { addPlugin("./views/transaction.qml", {noAdd: true, close: false, section: "legacy"}); addPlugin("./views/chain.qml", {noAdd: true, close: false, section: "legacy"}); - addPlugin("./views/info.qml", {noAdd: true, close: false, section: "legacy"}); addPlugin("./views/pending_tx.qml", {noAdd: true, close: false, section: "legacy"}); - addPlugin("./views/javascript.qml", {noAdd: true, close: false, section: "legacy"}); + addPlugin("./views/info.qml", {noAdd: true, close: false, section: "legacy"}); addPlugin("./views/jeffcoin/jeffcoin.qml", {noAdd: true, close: false, section: "apps"}) @@ -363,12 +362,7 @@ ApplicationWindow { view.visible = false view.anchors.fill = mainView - if( !view.hasOwnProperty("iconSource") ) { - console.log("Could not load plugin. Property 'iconSourc' not found on view."); - return; - } - - var menuItem = menu.createMenuItem(view.iconSource, view, options); + var menuItem = menu.createMenuItem(view, options); if( view.hasOwnProperty("menuItem") ) { view.menuItem = menuItem; } @@ -525,7 +519,7 @@ ApplicationWindow { } } - function createMenuItem(icon, view, options) { + function createMenuItem(view, options) { if(options === undefined) { options = {}; } @@ -547,7 +541,10 @@ ApplicationWindow { comp.view = view comp.title = view.title - comp.icon = view.iconSource + + if(view.hasOwnProperty("iconSource")) { + comp.icon = view.iconSource; + } comp.closable = options.close; return comp |