Merge pull request #368

94e8f3a Add mining screen (moneromooo.monero) 1cd7dd6 StandardDropdown: fix for empty model (moneromooo.monero)
2017-01-14 10:41:13 -05:00
parent a1c5e7fed2 94e8f3ac4c
commit b5ade0d9d1
7 changed files with 235 additions and 31 deletions
--- a/MiddlePanel.qml
+++ b/MiddlePanel.qml
@@ -52,6 +52,7 @@ Rectangle {
    property History historyView: History { }
    property Sign signView: Sign { }
    property Settings settingsView: Settings { }
+    property Mining miningView: Mining { }
    property AddressBook addressBookView: AddressBook { }


@@ -144,7 +145,7 @@ Rectangle {
               PropertyChanges { target: root; currentView: settingsView }
            }, State {
                name: "Mining"
-                PropertyChanges { /*TODO*/ }
+                PropertyChanges { target: root; currentView: miningView }
            }
        ]