Merge branch 'release/0.6.5' into develop

1 files changed, 16 insertions, 11 deletions

diff --git a/mist/assets/qml/wallet.qml b/mist/assets/qml/wallet.qml
index c4379cd47..24191eae8 100644
--- a/mist/assets/qml/wallet.qml
+++ b/mist/assets/qml/wallet.qml
@@ -16,8 +16,8 @@ ApplicationWindow {
     property var ethx : Eth.ethx
     property var web
 
-    width: 1024
-    height: 750
+    width: 1200
+    height: 820
     minimumHeight: 300
 
     title: "Mist"
@@ -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,10 @@ ApplicationWindow {
         addPlugin("./views/pending_tx.qml", {noAdd: true, close: false, section: "legacy"});
         addPlugin("./views/javascript.qml", {noAdd: true, close: false, section: "legacy"});
 
+	addPlugin("./views/jeffcoin/jeffcoin.qml", {noAdd: true, close: false, section: "apps"})
+
+	mainSplit.setView(wallet.view, wallet.menuItem);
+
         // Call the ready handler
         gui.done();
     }
@@ -97,7 +102,7 @@ ApplicationWindow {
             var view = mainView.createView(component, options)
             var views = addViews(view, path, options)
 
-            return views.view
+            return views
         } catch(e) {
             ethx.note(e)
         }
@@ -374,8 +379,8 @@ ApplicationWindow {
          ********************/
          Rectangle {
              id: menu
-             Layout.minimumWidth: 180
-             Layout.maximumWidth: 180
+             Layout.minimumWidth: 210
+             Layout.maximumWidth: 210
              anchors.top: parent.top
              color: "#ececec"
 
@@ -394,7 +399,7 @@ ApplicationWindow {
                          sel.visible = on
                      }
 
-                     width: 176
+                     width: 206
                      height: 28
                      color: "#00000000"
 
@@ -801,9 +806,9 @@ ApplicationWindow {
                  anchors.left: aboutIcon.right
                  anchors.leftMargin: 10
                  anchors.top: parent.top
-                 anchors.topMargin: 40
+                 anchors.topMargin: 30
                  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><h3>Building</h3>Maran Hidskes"
              }
          }
 
@@ -867,7 +872,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"})
                  }
              }