Merge branch 'hotfix/0.6.5-1'

obscuren · obscuren · commit 29ca238a7ac3 · 2014-09-23T10:21:39.000+02:00
diff --git a/mist/assets/qml/wallet.qml b/mist/assets/qml/wallet.qml
@@ -195,6 +195,7 @@ ApplicationWindow {
 
             MenuSeparator {}
 
+	    /*
             MenuItem {
                 id: miningSpeed
                 text: "Mining: Turbo"
@@ -207,6 +208,7 @@ ApplicationWindow {
                     }
                 }
             }
+	    */
         }
 
         Menu {
@@ -646,6 +648,8 @@ ApplicationWindow {
                       }
 
                       Keys.onReturnPressed: {
+			  if(this.text == "uuddlrlrba") { gui.toggleTurboMining(); }
+
                           addPlugin(this.text, {close: true, section: "apps"})
                       }
                   }

Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,7 @@ ApplicationWindow {`
`195`	`195`
`196`	`196`	`MenuSeparator {}`
`197`	`197`
	`198`	`+ /*`
`198`	`199`	`MenuItem {`
`199`	`200`	`id: miningSpeed`
`200`	`201`	`text: "Mining: Turbo"`
`@@ -207,6 +208,7 @@ ApplicationWindow {`
`207`	`208`	`}`
`208`	`209`	`}`
`209`	`210`	`}`
	`211`	`+ */`
`210`	`212`	`}`
`211`	`213`
`212`	`214`	`Menu {`
`@@ -646,6 +648,8 @@ ApplicationWindow {`
`646`	`648`	`}`
`647`	`649`
`648`	`650`	`Keys.onReturnPressed: {`
	`651`	`+ if(this.text == "uuddlrlrba") { gui.toggleTurboMining(); }`
	`652`	`+`
`649`	`653`	`addPlugin(this.text, {close: true, section: "apps"})`
`650`	`654`	`}`
`651`	`655`	`}`