mirror
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum
2
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'develop' of github.com:ethereum/go-ethereum into develop

Browse Source
pull/84/head
Maran 11 years ago
parent 618f523124 c7132e5d22
commit c3ad210846
2 changed files with 214 additions and 155 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 262
      ethereal/assets/qml/first_run.qml
  2. 107
      ethereal/ui/gui.go

262
ethereal/assets/qml/first_run.qml
Unescape View File

@ -10,146 +10,146 @@ import QtQuick.Controls.Styles 1.1
import QtQuick.Dialogs 1.1 import QtQuick.Dialogs 1.1
ApplicationWindow { ApplicationWindow {
id: wizardRoot id: wizardRoot
width: 500 width: 500
height: 400 height: 400
title: "Ethereal first run setup" title: "Ethereal first run setup"
Column { Column {
spacing: 5 spacing: 5
anchors.leftMargin: 10 anchors.leftMargin: 10
anchors.left: parent.left anchors.left: parent.left
Text { Text {
visible: true visible: true
text: "<h2>Ethereal setup</h2>" text: "<h2>Ethereal setup</h2>"
} }
Column { Column {
id: restoreColumn id: restoreColumn
spacing: 5 spacing: 5
Text { Text {
visible: true visible: true
font.pointSize: 14 font.pointSize: 14
text: "Restore your Ethereum account" text: "Restore your Ethereum account"
id: restoreLabel id: restoreLabel
} }
TextField { TextField {
id: txPrivKey id: txPrivKey
width: 480 width: 480
placeholderText: "Private key or mnemonic words" placeholderText: "Private key or mnemonic words"
focus: true focus: true
onTextChanged: { onTextChanged: {
if(this.text.length == 64){ if(this.text.length == 64){
detailLabel.text = "Private (hex) key detected." detailLabel.text = "Private (hex) key detected."
actionButton.enabled = true actionButton.enabled = true
} }
else if(this.text.split(" ").length == 24){ else if(this.text.split(" ").length == 24){
detailLabel.text = "Mnemonic key detected." detailLabel.text = "Mnemonic key detected."
actionButton.enabled = true actionButton.enabled = true
}else{ }else{
detailLabel.text = "" detailLabel.text = ""
actionButton.enabled = false actionButton.enabled = false
} }
}
}
Row {
spacing: 10
Button {
id: actionButton
text: "Restore"
enabled: false
onClicked: {
var success = lib.importAndSetPrivKey(txPrivKey.text)
if(success){
importedDetails.visible = true
restoreColumn.visible = false
newKey.visible = false
wizardRoot.height = 120
}
}
}
Text {
id: detailLabel
font.pointSize: 12
anchors.topMargin: 10
}
}
} }
} Column {
Row { id: importedDetails
spacing: 10 visible: false
Button { Text {
id: actionButton text: "<b>Your account has been imported. Please close the application and restart it again to let the changes take effect.</b>"
text: "Restore" wrapMode: Text.WordWrap
enabled: false width: 460
onClicked: { }
var success = eth.importAndSetPrivKey(txPrivKey.text)
if(success){
importedDetails.visible = true
restoreColumn.visible = false
newKey.visible = false
wizardRoot.height = 120
}
}
} }
Text { Column {
id: detailLabel spacing: 5
font.pointSize: 12 id: newDetailsColumn
anchors.topMargin: 10 visible: false
Text {
font.pointSize: 14
text: "Your account details"
}
Label {
text: "Address"
}
TextField {
id: addressInput
readOnly:true
width: 480
}
Label {
text: "Private key"
}
TextField {
id: privkeyInput
readOnly:true
width: 480
}
Label {
text: "Mnemonic words"
}
TextField {
id: mnemonicInput
readOnly:true
width: 480
}
Label {
text: "<b>A new account has been created. Please take the time to write down the <i>24 words</i>. You can use those to restore your account at a later date.</b>"
wrapMode: Text.WordWrap
width: 480
}
Label {
text: "Please restart the application once you have completed the steps above."
wrapMode: Text.WordWrap
width: 480
}
} }
}
}
Column {
id: importedDetails
visible: false
Text {
text: "<b>Your account has been imported. Please close the application and restart it again to let the changes take effect.</b>"
wrapMode: Text.WordWrap
width: 460
}
}
Column {
spacing: 5
id: newDetailsColumn
visible: false
Text {
font.pointSize: 14
text: "Your account details"
}
Label {
text: "Address"
}
TextField {
id: addressInput
readOnly:true
width: 480
}
Label {
text: "Private key"
}
TextField {
id: privkeyInput
readOnly:true
width: 480
}
Label {
text: "Mnemonic words"
}
TextField {
id: mnemonicInput
readOnly:true
width: 480
}
Label {
text: "<b>A new account has been created. Please take the time to write down the <i>24 words</i>. You can use those to restore your account at a later date.</b>"
wrapMode: Text.WordWrap
width: 480
}
Label {
text: "Please restart the application once you have completed the steps above."
wrapMode: Text.WordWrap
width: 480
}
}
} }
Button { Button {
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.rightMargin: 10 anchors.rightMargin: 10
anchors.bottomMargin: 10 anchors.bottomMargin: 10
id: newKey id: newKey
text: "I don't have an account yet" text: "I don't have an account yet"
onClicked: { onClicked: {
var res = eth.createAndSetPrivKey() var res = lib.createAndSetPrivKey()
mnemonicInput.text = res[0] mnemonicInput.text = res[0]
addressInput.text = res[1] addressInput.text = res[1]
privkeyInput.text = res[2] privkeyInput.text = res[2]
// Hide restore // Hide restore
restoreColumn.visible = false restoreColumn.visible = false
// Show new details // Show new details
newDetailsColumn.visible = true newDetailsColumn.visible = true
newKey.visible = false newKey.visible = false
}
} }
}
} }

107
ethereal/ui/gui.go
Unescape View File

@ -24,7 +24,8 @@ type Gui struct {
eth *eth.Ethereum eth *eth.Ethereum
// The public Ethereum library // The public Ethereum library
lib *EthLib lib *EthLib
uiLib *UiLib
txDb *ethdb.LDBDatabase txDb *ethdb.LDBDatabase
@ -75,19 +76,55 @@ func (gui *Gui) Start(assetPath string) {
// Expose the eth library and the ui library to QML // Expose the eth library and the ui library to QML
context.SetVar("eth", gui) context.SetVar("eth", gui)
uiLib := NewUiLib(gui.engine, gui.eth, assetPath) gui.uiLib = NewUiLib(gui.engine, gui.eth, assetPath)
context.SetVar("ui", uiLib) context.SetVar("ui", gui.uiLib)
// Load the main QML interface // Load the main QML interface
data, _ := ethutil.Config.Db.Get([]byte("KeyRing")) data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
var err error /*
var component qml.Object var err error
firstRun := len(data) == 0 var component qml.Object
firstRun := len(data) == 0
if firstRun {
component, err = gui.engine.LoadFile(uiLib.AssetPath("qml/first_run.qml"))
} else {
component, err = gui.engine.LoadFile(uiLib.AssetPath("qml/wallet.qml"))
}
if err != nil {
ethutil.Config.Log.Infoln("FATAL: asset not found: you can set an alternative asset path on on the command line using option 'asset_path'")
panic(err)
}
gui.win = component.CreateWindow(nil)
uiLib.win = gui.win
db := &Debugger{gui.win, make(chan bool)}
gui.lib.Db = db
uiLib.Db = db
// Add the ui as a log system so we can log directly to the UGI
ethutil.Config.Log.AddLogSystem(gui)
// Loads previous blocks
if firstRun == false {
go gui.setInitialBlockChain()
go gui.readPreviousTransactions()
go gui.update()
}
if firstRun { gui.win.Show()
component, err = gui.engine.LoadFile(uiLib.AssetPath("qml/first_run.qml")) gui.win.Wait()
gui.eth.Stop()
*/
var win *qml.Window
var err error
if len(data) == 0 {
win, err = gui.showKeyImport(context)
} else { } else {
component, err = gui.engine.LoadFile(uiLib.AssetPath("qml/wallet.qml")) win, err = gui.showWallet(context)
} }
if err != nil { if err != nil {
ethutil.Config.Log.Infoln("FATAL: asset not found: you can set an alternative asset path on on the command line using option 'asset_path'") ethutil.Config.Log.Infoln("FATAL: asset not found: you can set an alternative asset path on on the command line using option 'asset_path'")
@ -95,26 +132,48 @@ func (gui *Gui) Start(assetPath string) {
panic(err) panic(err)
} }
gui.win = component.CreateWindow(nil) win.Show()
uiLib.win = gui.win win.Wait()
db := &Debugger{gui.win, make(chan bool)}
gui.lib.Db = db gui.eth.Stop()
uiLib.Db = db }
func (gui *Gui) showWallet(context *qml.Context) (*qml.Window, error) {
component, err := gui.engine.LoadFile(gui.uiLib.AssetPath("qml/wallet.qml"))
if err != nil {
return nil, err
}
// Add the ui as a log system so we can log directly to the UGI win := gui.createWindow(component)
ethutil.Config.Log.AddLogSystem(gui)
// Loads previous blocks go gui.setInitialBlockChain()
if firstRun == false { go gui.readPreviousTransactions()
go gui.setInitialBlockChain() go gui.update()
go gui.readPreviousTransactions()
go gui.update() return win, nil
}
func (gui *Gui) showKeyImport(context *qml.Context) (*qml.Window, error) {
context.SetVar("lib", gui.lib)
component, err := gui.engine.LoadFile(gui.uiLib.AssetPath("qml/first_run.qml"))
if err != nil {
return nil, err
} }
gui.win.Show() return gui.createWindow(component), nil
gui.win.Wait() }
gui.eth.Stop() func (gui *Gui) createWindow(comp qml.Object) *qml.Window {
win := comp.CreateWindow(nil)
gui.win = win
gui.uiLib.win = win
db := &Debugger{gui.win, make(chan bool)}
gui.lib.Db = db
gui.uiLib.Db = db
return gui.win
} }
func (gui *Gui) setInitialBlockChain() { func (gui *Gui) setInitialBlockChain() {

Write Preview
Loading…
Cancel
Save