Added ini file for ethereum. fixes #66

poc8
obscuren 11 years ago
parent 65c5a20e1c
commit 0bdb0a9d58
  1. 27
      ethereal/assets/qml/wallet.qml
  2. 2
      ethereal/ethereum.go
  3. 9
      ethereal/ui/gui.go
  4. 12
      ethereum/ethereum.go

@ -221,25 +221,32 @@ ApplicationWindow {
color: "#00000000" color: "#00000000"
anchors.fill: parent anchors.fill: parent
Column {
spacing: 3
anchors.fill: parent
anchors.topMargin: 5
anchors.leftMargin: 5
Label { Label {
id: addressLabel id: addressLabel
text: "Address" text: "Address"
anchors {
margins: 5
top: parent.top
left: parent.left
}
} }
TextField { TextField {
anchors {
margins: 5
left: addressLabel.right
top: parent.top
}
text: pub.getKey().address text: pub.getKey().address
width: 500 width: 500
} }
Label {
text: "Client ID"
}
TextField {
text: eth.clientId()
onTextChanged: {
eth.changeClientId(text)
}
}
}
property var addressModel: ListModel { property var addressModel: ListModel {
id: addressModel id: addressModel

@ -50,7 +50,7 @@ func main() {
} else { } else {
g.ParseAll() g.ParseAll()
} }
ethutil.ReadConfig(".ethereal", ethutil.LogFile|ethutil.LogStd, Identifier) ethutil.ReadConfig(".ethereal", ethutil.LogFile|ethutil.LogStd, g, Identifier)
// Instantiated a eth stack // Instantiated a eth stack
ethereum, err := eth.New(eth.CapDefault, UseUPnP) ethereum, err := eth.New(eth.CapDefault, UseUPnP)

@ -67,6 +67,7 @@ func (gui *Gui) Start(assetPath string) {
}}) }})
ethutil.Config.SetClientString(fmt.Sprintf("/Ethereal v%s", version)) ethutil.Config.SetClientString(fmt.Sprintf("/Ethereal v%s", version))
// Create a new QML engine // Create a new QML engine
gui.engine = qml.NewEngine() gui.engine = qml.NewEngine()
context := gui.engine.Context() context := gui.engine.Context()
@ -315,3 +316,11 @@ func (gui *Gui) Create(recipient, value, gas, gasPrice, data string) (*ethpub.PR
return gui.pub.Transact(ethutil.Hex(keyPair.PrivateKey), recipient, value, gas, gasPrice, data) return gui.pub.Transact(ethutil.Hex(keyPair.PrivateKey), recipient, value, gas, gasPrice, data)
} }
func (gui *Gui) ChangeClientId(id string) {
ethutil.Config.SetIdentifier(id)
}
func (gui *Gui) ClientId() string {
return ethutil.Config.Identifier
}

@ -6,10 +6,12 @@ import (
"github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/go-ethereum/utils" "github.com/ethereum/go-ethereum/utils"
"github.com/rakyll/globalconf"
"io/ioutil" "io/ioutil"
"log" "log"
"os" "os"
"os/signal" "os/signal"
"path"
"runtime" "runtime"
"strings" "strings"
) )
@ -59,7 +61,15 @@ func main() {
lt = ethutil.LogFile | ethutil.LogStd lt = ethutil.LogFile | ethutil.LogStd
} }
ethutil.ReadConfig(".ethereum", lt, Identifier) g, err := globalconf.NewWithOptions(&globalconf.Options{
Filename: path.Join(ethutil.ApplicationFolder(".ethereal"), "conf.ini"),
})
if err != nil {
fmt.Println(err)
} else {
g.ParseAll()
}
ethutil.ReadConfig(".ethereum", lt, g, Identifier)
logger := ethutil.Config.Log logger := ethutil.Config.Log

Loading…
Cancel
Save