diff --git a/README.md b/README.md index 3a73f8ac9..e5818ffca 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Ethereum Ethereum Go Client © 2014 Jeffrey Wilcke. -Current state: Proof of Concept 5.0 RC7. +Current state: Proof of Concept 5.0 RC8. For the development package please see the [eth-go package](https://github.com/ethereum/eth-go). @@ -26,28 +26,25 @@ General command line options ==================== ``` --c Launch the developer console (node only) +Shared between ethereum and ethereal -m Start mining blocks -genaddr Generates a new address and private key (destructive action) --p Port on which the server will accept incomming connections (= 30303) --upnp Enable UPnP (= false) --x Desired amount of peers (= 5) --h This help +-p Port on which the server will accept incomming connections +-upnp Enable UPnP +-x Desired amount of peers -r Start JSON RPC --dir Data directory used to store configs and databases (=".ethereum") --import Import a private key (hex) -``` +-dir Data directory used to store configs and databases +-import Import a private key +-h This -Developer console commands -========================== +Ethereum only +ethereum [options] [filename] +-js Start the JavaScript REPL +filename Load the given file and interpret as JavaScript +Etheral only +-asset_path absolute path to GUI assets directory ``` -addp : Connect to the given host -tx Send Wei to the specified -contract Creates a new contract and launches the editor -``` - -See the "help" command for *developer* options. Contribution ============ diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index 4813aaede..51f064adf 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/ethereal/assets/qml/wallet.qml @@ -67,6 +67,7 @@ ApplicationWindow { networkView.visible = false historyView.visible = false newTxView.visible = false + infoView.visible = false view.visible = true //root.title = "Ethereal - " = view.title } @@ -120,6 +121,17 @@ ApplicationWindow { } } } + + Image { + source: ui.assetPath("net.png") + anchors.horizontalCenter: parent.horizontalCenter + MouseArea { + anchors.fill: parent + onClicked: { + setView(infoView) + } + } + } } } @@ -217,6 +229,33 @@ ApplicationWindow { } } + Rectangle { + id: infoView + property var title: "Information" + visible: false + color: "#00000000" + anchors.fill: parent + + Label { + id: addressLabel + text: "Address" + anchors { + margins: 5 + top: parent.top + left: parent.left + } + } + TextField { + anchors { + margins: 5 + left: addressLabel.right + top: parent.top + } + text: pub.getKey().address + width: 500 + } + } + /* signal addPlugin(string name) Component { diff --git a/ethereal/assets/samplecoin/samplecoin.html b/ethereal/assets/samplecoin/samplecoin.html index d47c6323c..3892141cd 100644 --- a/ethereal/assets/samplecoin/samplecoin.html +++ b/ethereal/assets/samplecoin/samplecoin.html @@ -9,7 +9,7 @@