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/qml/wallet.qml')

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 v1.2.3


From c35950de476bbfedfc17cb7842a03d9bbdba76fc Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 22 Sep 2014 16:35:25 +0200
Subject: Version numbering

---
 mist/assets/qml/wallet.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mist/assets/qml/wallet.qml')

diff --git a/mist/assets/qml/wallet.qml b/mist/assets/qml/wallet.qml
index 4bf9887f5..8a34caddf 100644
--- a/mist/assets/qml/wallet.qml
+++ b/mist/assets/qml/wallet.qml
@@ -804,9 +804,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 (0.6.5)</h2><h4>Amalthea</h4><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"
              }
          }
 
-- 
cgit v1.2.3


From 67dc3be54ac76ef3ba62e0c4c948764b83836968 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 22 Sep 2014 17:38:15 +0200
Subject: Added a sample app ;-)

---
 mist/assets/qml/wallet.qml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mist/assets/qml/wallet.qml')

diff --git a/mist/assets/qml/wallet.qml b/mist/assets/qml/wallet.qml
index 8a34caddf..c30c6fcce 100644
--- a/mist/assets/qml/wallet.qml
+++ b/mist/assets/qml/wallet.qml
@@ -55,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"});
 
+	addPlugin("./views/jeffcoin/jeffcoin.qml", {noAdd: true, close: false, section: "apps"})
+
 	mainSplit.setView(wallet.view, wallet.menuItem);
 
         // Call the ready handler
-- 
cgit v1.2.3


From d5262a3350799b63faf9ec43d994ee068b46b7a3 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 22 Sep 2014 18:06:57 +0200
Subject: Higher default values

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

(limited to 'mist/assets/qml/wallet.qml')

diff --git a/mist/assets/qml/wallet.qml b/mist/assets/qml/wallet.qml
index c30c6fcce..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"
@@ -379,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"
 
@@ -399,7 +399,7 @@ ApplicationWindow {
                          sel.visible = on
                      }
 
-                     width: 176
+                     width: 206
                      height: 28
                      color: "#00000000"
 
-- 
cgit v1.2.3