From 761af68df4093ef4925ef4df222925773fbaf7c1 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 22 Sep 2014 16:30:43 +0200
Subject: Changed peer server default

---
 mist/assets/qml/wallet.qml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'mist/assets')

diff --git a/mist/assets/qml/wallet.qml b/mist/assets/qml/wallet.qml
index c4379cd47..4bf9887f5 100644
--- a/mist/assets/qml/wallet.qml
+++ b/mist/assets/qml/wallet.qml
@@ -45,8 +45,9 @@ ApplicationWindow {
 
     // Takes care of loading all default plugins
     Component.onCompleted: {
-        addPlugin("./views/wallet.qml", {noAdd: true, close: false, section: "ethereum", active: true});
-        root.web = addPlugin("./webapp.qml", {noAdd: true, close: false, section: "ethereum", active: true});
+        var wallet = addPlugin("./views/wallet.qml", {noAdd: true, close: false, section: "ethereum", active: true});
+        var browser = addPlugin("./webapp.qml", {noAdd: true, close: false, section: "ethereum", active: true});
+	root.web = browser.view;
 
         addPlugin("./views/transaction.qml", {noAdd: true, close: false, section: "legacy"});
         addPlugin("./views/chain.qml", {noAdd: true, close: false, section: "legacy"});
@@ -54,6 +55,8 @@ ApplicationWindow {
         addPlugin("./views/pending_tx.qml", {noAdd: true, close: false, section: "legacy"});
         addPlugin("./views/javascript.qml", {noAdd: true, close: false, section: "legacy"});
 
+	mainSplit.setView(wallet.view, wallet.menuItem);
+
         // Call the ready handler
         gui.done();
     }
@@ -97,7 +100,7 @@ ApplicationWindow {
             var view = mainView.createView(component, options)
             var views = addViews(view, path, options)
 
-            return views.view
+            return views
         } catch(e) {
             ethx.note(e)
         }
@@ -803,7 +806,7 @@ ApplicationWindow {
                  anchors.top: parent.top
                  anchors.topMargin: 40
                  font.pointSize: 12
-                 text: "<h2>Mist - Amalthea</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>"
+                 text: "<h2>Mist (0.6.5)</h2><h4>Amalthea</h4><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>"
              }
          }
 
@@ -867,7 +870,7 @@ ApplicationWindow {
                          pastPeers.append({text: ips.get(i)})
                      }
 
-                     pastPeers.insert(0, {text: "54.76.56.74:30303"})
+                     pastPeers.insert(0, {text: "poc-6.ethdev.com:30303"})
                  }
              }
 
-- 
cgit