Initial refactor for wallet qml

1 files changed, 7 insertions, 258 deletions

diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml
index 1a14697e6..1452b1f97 100644
--- a/ethereal/assets/qml/wallet.qml
+++ b/ethereal/assets/qml/wallet.qml
@@ -108,6 +108,7 @@ ApplicationWindow {
 			//color: "#D9DDE7"
 			color: "#252525"
 
+
 			ColumnLayout {
 				y: 50
 				anchors.left: parent.left
@@ -187,270 +188,18 @@ ApplicationWindow {
 					anchors.bottomMargin: 5
 					id: newTransactionTab
 					Component.onCompleted:{
-						addTab("Simple send", newTransaction)
-						addTab("Create contract", newContract)
-					}
-				}
-				Component {
-					id: newTransaction
-					Column {
-						id: simpleSendColumn
-						states: [
-							State{
-								name: "ERROR"
-							},
-							State {
-								name: "DONE"
-								PropertyChanges { target: txSimpleValue; visible:false}
-								PropertyChanges { target: txSimpleRecipient; visible:false}
-								PropertyChanges { target:newSimpleTxButton; visible:false}
-
-								PropertyChanges { target: txSimpleResult; visible:true}
-								PropertyChanges { target: txSimpleOutput; visible:true}
-								PropertyChanges { target:newSimpleTxButton; visible:true}
-							},
-							State {
-								name: "SETUP"
-								PropertyChanges { target: txSimpleValue; visible:true; text: ""}
-								PropertyChanges { target: txSimpleRecipient; visible:true; text: ""}
-								PropertyChanges { target: txSimpleButton; visible:true}
-								PropertyChanges { target:newSimpleTxButton; visible:false}
-							}
-						]
-						spacing: 5
-						anchors.leftMargin: 5
-						anchors.topMargin: 5
-						anchors.top: parent.top
-						anchors.left: parent.left
-
-						function checkFormState(){
-							if(txSimpleRecipient.text.length == 40 && txSimpleValue.text.length > 0) {
-								txSimpleButton.state = "READY"
-							}else{
-								txSimpleButton.state = "NOTREADY"
-							}
-						}
-
-						TextField {
-							id: txSimpleRecipient
-							placeholderText: "Recipient address"
-							Layout.fillWidth: true
-							validator: RegExpValidator { regExp: /[a-f0-9]{40}/ }
-							width: 530
-							onTextChanged: { checkFormState() }
-						}
-						TextField {
-							id: txSimpleValue
-							placeholderText: "Amount"
-							anchors.rightMargin: 5
-							validator: IntValidator { }
-							onTextChanged: { checkFormState() }
-						}
-						Button {
-							id: txSimpleButton
-							states: [
-								State {
-									name: "READY"
-									PropertyChanges { target: txSimpleButton; enabled: true}
-								},
-								State {
-									name: "NOTREADY"
-									PropertyChanges { target: txSimpleButton; enabled: false}
-								}
-							]
-							text: "Send"
-							enabled: false
-							onClicked: {
-								//this.enabled = false
-								var res = eth.createTx(txSimpleRecipient.text, txSimpleValue.text,"","","")
-								if(res[1]) {
-									txSimpleResult.text = "There has been an error broadcasting your transaction:" + res[1].error()
-								} else {
-									txSimpleResult.text = "Your transaction has been broadcasted over the network.\nYour transaction id is:"
-									txSimpleOutput.text = res[0]
-									this.visible = false
-									simpleSendColumn.state = "DONE"
-								}
-							}
-						}
-						Text {
-							id: txSimpleResult
-							visible: false
-
-						}
-						TextField {
-							id: txSimpleOutput
-							visible: false
-							width: 530
-						}
-						Button {
-							id: newSimpleTxButton
-							visible: false
-							text: "Create an other transaction"
-							onClicked: {
-								this.visible = false
-								simpleSendColumn.state = "SETUP"
-							}
-						}
-					}
-				}
-				Component {
-					id: newContract
-					Column {
-						id: mainContractColumn
-						function contractFormReady(){
-							if(codeView.text.length > 0 && txValue.text.length > 0 && txGas.text.length > 0 && txGasPrice.length > 0) {
-								txButton.state = "READY"
-							}else{
-								txButton.state = "NOTREADY"
-							}
-						}
-						states: [
-							State{
-								name: "ERROR"
-								PropertyChanges { target: txResult; visible:true}
-								PropertyChanges { target: codeView; visible:true}
-							},
-							State {
-								name: "DONE"
-								PropertyChanges { target: txValue; visible:false}
-								PropertyChanges { target: txGas; visible:false}
-								PropertyChanges { target: txGasPrice; visible:false}
-								PropertyChanges { target: codeView; visible:false}
-								PropertyChanges { target: txButton; visible:false}
-								PropertyChanges { target: txDataLabel; visible:false}
-
-								PropertyChanges { target: txResult; visible:true}
-								PropertyChanges { target: txOutput; visible:true}
-								PropertyChanges { target: newTxButton; visible:true}
-							},
-							State {
-								name: "SETUP"
-								PropertyChanges { target: txValue; visible:true; text: ""}
-								PropertyChanges { target: txGas; visible:true; text: ""}
-								PropertyChanges { target: txGasPrice; visible:true; text: ""}
-								PropertyChanges { target: codeView; visible:true; text: ""}
-								PropertyChanges { target: txButton; visible:true}
-								PropertyChanges { target: txDataLabel; visible:true}
-
-								PropertyChanges { target: txResult; visible:false}
-								PropertyChanges { target: txOutput; visible:false}
-								PropertyChanges { target: newTxButton; visible:false}
-							}
-						]
-						width: 400
-						spacing: 5
-						anchors.left: parent.left
-						anchors.top: parent.top
-						anchors.leftMargin: 5
-						anchors.topMargin: 5
-
-						TextField {
-							id: txValue
-							width: 200
-							placeholderText: "Amount"
-							validator: IntValidator { }
-							onTextChanged: {
-								contractFormReady()
-							}
-						}
-						TextField {
-							id: txGas
-							width: 200
-							validator: IntValidator { }
-							placeholderText: "Gas"
-							onTextChanged: {
-								contractFormReady()
-							}
-						}
-						TextField {
-							id: txGasPrice
-							width: 200
-							placeholderText: "Gas price"
-							validator: IntValidator { }
-							onTextChanged: {
-								contractFormReady()
-							}
-						}
-
-						Label {
-							id: txDataLabel
-							text: "Transaction data"
-						}
-
-						TextArea {
-							id: codeView
-							anchors.topMargin: 5
-							Layout.fillWidth: true
-							width: parent.width /2
-							onTextChanged: {
-								contractFormReady()
-							}
-						}
+						var component = Qt.createComponent("newTransaction/_simple_send.qml")
+						var newTransaction = component.createObject("newTransaction")
 
-						Button {
-							id: txButton
-							states: [
-								State {
-									name: "READY"
-									PropertyChanges { target: txButton; enabled: true}
-								},
-								State {
-									name: "NOTREADY"
-									PropertyChanges { target: txButton; enabled:false}
-								}
-							]
-							text: "Send"
-							enabled: false
-							onClicked: {
-								//this.enabled = false
-								var res = eth.createTx("", txValue.text, txGas.text, txGasPrice.text, codeView.text)
-								if(res[1]) {
-									txResult.text = "Your contract <b>could not</b> be send over the network:\n<b>"
-									txResult.text += res[1].error()
-									txResult.text += "</b>"
-									mainContractColumn.state = "ERROR"
-								} else {
-									txResult.text = "Your contract has been submitted:\n"
-									txOutput.text = res[0]
-									mainContractColumn.state = "DONE"
-								}
-							}
-						}
-						Text {
-							id: txResult
-							visible: false
-						}
-						TextField {
-							id: txOutput
-							visible: false
-							width: 530
-						}
-						Button {
-							id: newTxButton
-							visible: false
-							text: "Create an other contract"
-							onClicked: {
-								this.visible = false
-								txResult.text = ""
-								txOutput.text = ""
-								mainContractColumn.state = "SETUP"
-							}
-						}
+						component = Qt.createComponent("newTransaction/_new_contract.qml")
+						var newContract = component.createObject("newContract")
 
-						Button {
-							id: debugButton
-							text: "Debug"
-							onClicked: {
-								var res = ui.debugTx("", txValue.text, txGas.text, txGasPrice.text, codeView.text)
-								debugWindow.visible = true
-							}
-						}
+						addTab("Simple send", newTransaction)
+						addTab("Create contract", newContract)
 					}
 				}
 			}
 
-
 			Rectangle {
 				id: networkView
 				property var title: "Network"