Merge aabb1cdeb6 into 7c583f8222

cmd/mist/assets/ext/ethereum.js

@@ -1 +1 @@
-Subproject commit 31e046dbecea51d3b99b21f3e7e60ddfb6c39304
+Subproject commit d5093606945fd871bc62f5d6adade3a903b0533c

cmd/mist/assets/qml/main.qml

@@ -180,6 +180,17 @@ ApplicationWindow {
                 }
             }
 
+            MenuItem {
+                text: "Onboarding Wizard..."
+                shortcut: "Ctrl+shift+i"
+                onTriggered: {
+                    onboardingWizard.visible = true;
+                    wizardWindow.state = "State-Initial";
+                    startTimerAnimation.running = true;
+                    startTimerAnimation.start();
+                }
+            }
+
             MenuItem {
                 text: "Export keys"
                 shortcut: "Ctrl+e"
@@ -985,6 +996,18 @@ ApplicationWindow {
              }
          }
 
+         Window {
+            id: onboardingWizard
+            visible: false
+            width: 990
+            height: 680
+            title: "Welcome to Ethereum"
+
+            Wizard {
+                id: onboardingWindow
+            }
+         }
+
          Window {
              id: addPeerWin
              visible: false