Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
e7a22af0
Commit
e7a22af0
authored
Jun 12, 2014
by
obscuren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor UI adjustments
parent
1d300bbc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
11 deletions
+40
-11
wallet.qml
ethereal/assets/qml/wallet.qml
+39
-10
gui.go
ethereal/ui/gui.go
+1
-1
No files found.
ethereal/assets/qml/wallet.qml
View file @
e7a22af0
...
...
@@ -768,6 +768,20 @@ ApplicationWindow {
anchors.leftMargin
:
5
anchors.topMargin
:
5
ListModel
{
id
:
denomModel
ListElement
{
text
:
"Wei"
;
zeros
:
""
}
ListElement
{
text
:
"Ada"
;
zeros
:
"000"
}
ListElement
{
text
:
"Babbage"
;
zeros
:
"000000"
}
ListElement
{
text
:
"Shannon"
;
zeros
:
"000000000"
}
ListElement
{
text
:
"Szabo"
;
zeros
:
"000000000000"
}
ListElement
{
text
:
"Finney"
;
zeros
:
"000000000000000"
}
ListElement
{
text
:
"Ether"
;
zeros
:
"000000000000000000"
}
ListElement
{
text
:
"Einstein"
;
zeros
:
"000000000000000000000"
}
ListElement
{
text
:
"Douglas"
;
zeros
:
"000000000000000000000000000000000000000000"
}
}
TextField
{
id
:
txFuelRecipient
placeholderText
:
"Address / Name or empty for contract"
...
...
@@ -775,13 +789,21 @@ ApplicationWindow {
width
:
400
}
TextField
{
id
:
txValue
width
:
222
placeholderText
:
"Amount"
validator
:
RegExpValidator
{
regExp
:
/
\d
*/
}
onTextChanged
:
{
contractFormReady
()
RowLayout
{
TextField
{
id
:
txValue
width
:
222
placeholderText
:
"Amount"
validator
:
RegExpValidator
{
regExp
:
/
\d
*/
}
onTextChanged
:
{
contractFormReady
()
}
}
ComboBox
{
id
:
valueDenom
currentIndex
:
6
model
:
denomModel
}
}
...
...
@@ -807,7 +829,7 @@ ApplicationWindow {
id
:
txGasPrice
width
:
200
placeholderText
:
"Gas price"
text
:
"10
00000
"
text
:
"10"
validator
:
RegExpValidator
{
regExp
:
/
\d
*/
}
/*
onTextChanged: {
...
...
@@ -815,6 +837,12 @@ ApplicationWindow {
}
*/
}
ComboBox
{
id
:
gasDenom
currentIndex
:
4
model
:
denomModel
}
}
Label
{
...
...
@@ -848,8 +876,9 @@ ApplicationWindow {
]
text
:
"Send"
onClicked
:
{
//this.enabled = false
var
res
=
eth
.
create
(
txFuelRecipient
.
text
,
txValue
.
text
,
txGas
.
text
,
txGasPrice
.
text
,
codeView
.
text
)
var
value
=
txValue
.
text
+
denomModel
.
get
(
valueDenom
.
currentIndex
).
zeros
;
var
gasPrice
=
txGasPrice
.
text
+
denomModel
.
get
(
gasDenom
.
currentIndex
).
zeros
;
var
res
=
eth
.
create
(
txFuelRecipient
.
text
,
value
,
txGas
.
text
,
gasPrice
,
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
()
...
...
ethereal/ui/gui.go
View file @
e7a22af0
...
...
@@ -69,7 +69,7 @@ func (gui *Gui) Start(assetPath string) {
Init
:
func
(
p
*
ethpub
.
KeyVal
,
obj
qml
.
Object
)
{
p
.
Key
=
""
;
p
.
Value
=
""
},
}})
ethutil
.
Config
.
SetClientString
(
fmt
.
Sprintf
(
"/Ethereal v%s"
,
version
)
)
ethutil
.
Config
.
SetClientString
(
"Ethereal"
)
// Create a new QML engine
gui
.
engine
=
qml
.
NewEngine
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment