1 files changed, 34 insertions, 17 deletions
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index a909916b7..f9ee6939d 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -46,7 +46,14 @@ ApplicationWindow {
         walletWeb.view.url = "http://ethereum-dapp-wallet.meteor.com/";
         walletWeb.menuItem.title = "Wallet";
 
-        addPlugin("./views/miner.qml", {noAdd: true, close: false, section: "ethereum", active: false});
+        addPlugin("./views/miner.qml", {noAdd: true, close: false, section: "legacy", active: false});
+        addPlugin("./views/network.qml", {noAdd: true, close: false, section: "ethereum", active: false});
+
+       /* var whisperTab = addPlugin("./views/browser.qml", {noAdd: true, close: true, section: "ethereum", active: false});
+        whisperTab.view.url = "http://ethereum-dapp-whisper-client.meteor.com/";
+        whisperTab.menuItem.title = "Whisper Chat";
+*/
+        addPlugin("./views/wallet.qml", {noAdd: true, close: false, section: "legacy"});        
         addPlugin("./views/transaction.qml", {noAdd: true, close: false, section: "legacy"});
         addPlugin("./views/whisper.qml", {noAdd: true, close: false, section: "legacy"});
         addPlugin("./views/chain.qml", {noAdd: true, close: false, section: "legacy"});
@@ -530,6 +537,8 @@ ApplicationWindow {
 
                      Text {
                          id: secondary
+                         //only shows secondary title if there's no badge
+                         visible: (badgeContent == "icon" || badgeContent == "number" )? false : true
                          font.family: sourceSansPro.name 
                          font.weight: Font.Light
                          anchors {
@@ -691,18 +700,23 @@ ApplicationWindow {
                  }
 
                  Rectangle {
-                     height: 55
+                     height: 19
                      color: "transparent"
                      Text {
                          text: "ETHEREUM"
                          font.family: sourceSansPro.name 
-                         font.weight: Font.DemiBold
-                         anchors {
-                             left: parent.left
-                             top: parent.verticalCenter
-                             leftMargin: 16
-                         }
-                         color: "#AAA0A0"
+                         font.weight: Font.Regular
+                         // anchors.top:  20
+                         // anchors.left:  16
+                        anchors {
+                            leftMargin: 12
+                            topMargin: 4
+                            fill: parent
+                        }
+                         // anchors.leftMargin: 16 
+                         // anchors.topMargin: 16 
+                        // anchors.verticalCenterOffset: 50
+                         color: "#AAA0A0" 
                      }
                  }
 
@@ -717,17 +731,16 @@ ApplicationWindow {
                  }
 
                  Rectangle {
-                     height: 55
-                     color: "transparent"
+                     height: 19
+                     color: "#00ff00"
+                     visible: (menuApps.children.length > 0)
+
                      Text {
                          text: "APPS"
                          font.family: sourceSansPro.name 
-                         font.weight: Font.DemiBold
-                         anchors {
-                             left: parent.left
-                             top: parent.verticalCenter
-                             leftMargin: 16
-                         }
+                         font.weight: Font.Regular
+                         anchors.fill: parent
+                         anchors.leftMargin: 16
                          color: "#AAA0A0"
                      }
                  }
@@ -735,6 +748,8 @@ ApplicationWindow {
                  ColumnLayout {
                      id: menuApps
                      spacing: 3
+
+
                      anchors {
                          left: parent.left
                          right: parent.right
@@ -744,6 +759,7 @@ ApplicationWindow {
                  Rectangle {
                      height: 55
                      color: "transparent"
+                     visible: true
                      Text {
                          text: "DEBUG"
                          font.family: sourceSansPro.name 
@@ -760,6 +776,7 @@ ApplicationWindow {
 
                  ColumnLayout {
                      id: menuLegacy
+                     visible: true
                      spacing: 3
                      anchors {
                          left: parent.left