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
8a2698ad
Commit
8a2698ad
authored
Apr 14, 2014
by
Maran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add send to contract
parent
ab8d9625
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
4 deletions
+37
-4
_new_contract.qml
ethereal/assets/qml/newTransaction/_new_contract.qml
+36
-3
wallet.qml
ethereal/assets/qml/wallet.qml
+1
-1
No files found.
ethereal/assets/qml/newTransaction/_new_contract.qml
View file @
8a2698ad
...
@@ -85,9 +85,34 @@ Component {
...
@@ -85,9 +85,34 @@ Component {
}
}
}
}
Row
{
id
:
rowContract
ExclusiveGroup
{
id
:
contractTypeGroup
}
RadioButton
{
id
:
createContractRadio
text
:
"Create contract"
checked
:
true
exclusiveGroup
:
contractTypeGroup
onClicked
:
{
txFuelRecipient
.
visible
=
false
txDataLabel
.
text
=
"Contract code"
}
}
RadioButton
{
id
:
runContractRadio
text
:
"Run contract"
exclusiveGroup
:
contractTypeGroup
onClicked
:
{
txFuelRecipient
.
visible
=
true
txDataLabel
.
text
=
"Contract arguments"
}
}
}
Label
{
Label
{
id
:
txDataLabel
id
:
txDataLabel
text
:
"
Transaction data
"
text
:
"
Contract code
"
}
}
TextArea
{
TextArea
{
...
@@ -100,6 +125,14 @@ Component {
...
@@ -100,6 +125,14 @@ Component {
}
}
}
}
TextField
{
id
:
txFuelRecipient
placeholderText
:
"Contract address"
validator
:
RegExpValidator
{
regExp
:
/
[
a-f0-9
]{40}
/
}
visible
:
false
width
:
530
}
Button
{
Button
{
id
:
txButton
id
:
txButton
states
:
[
states
:
[
...
@@ -116,14 +149,14 @@ Component {
...
@@ -116,14 +149,14 @@ Component {
enabled
:
false
enabled
:
false
onClicked
:
{
onClicked
:
{
//this.enabled = false
//this.enabled = false
var
res
=
eth
.
createTx
(
""
,
txValue
.
text
,
txGas
.
text
,
txGasPrice
.
text
,
codeView
.
text
)
var
res
=
eth
.
createTx
(
txFuelRecipient
.
text
,
txValue
.
text
,
txGas
.
text
,
txGasPrice
.
text
,
codeView
.
text
)
if
(
res
[
1
])
{
if
(
res
[
1
])
{
txResult
.
text
=
"Your contract <b>could not</b> be send over the network:
\n
<b>"
txResult
.
text
=
"Your contract <b>could not</b> be send over the network:
\n
<b>"
txResult
.
text
+=
res
[
1
].
error
()
txResult
.
text
+=
res
[
1
].
error
()
txResult
.
text
+=
"</b>"
txResult
.
text
+=
"</b>"
mainContractColumn
.
state
=
"ERROR"
mainContractColumn
.
state
=
"ERROR"
}
else
{
}
else
{
txResult
.
text
=
"Your
contract
has been submitted:
\n
"
txResult
.
text
=
"Your
transaction
has been submitted:
\n
"
txOutput
.
text
=
res
[
0
]
txOutput
.
text
=
res
[
0
]
mainContractColumn
.
state
=
"DONE"
mainContractColumn
.
state
=
"DONE"
}
}
...
...
ethereal/assets/qml/wallet.qml
View file @
8a2698ad
...
@@ -167,7 +167,7 @@ ApplicationWindow {
...
@@ -167,7 +167,7 @@ ApplicationWindow {
var
newContract
=
component
.
createObject
(
"newContract"
)
var
newContract
=
component
.
createObject
(
"newContract"
)
addTab
(
"Simple send"
,
newTransaction
)
addTab
(
"Simple send"
,
newTransaction
)
addTab
(
"C
reate contract
"
,
newContract
)
addTab
(
"C
ontracts
"
,
newContract
)
}
}
}
}
}
}
...
...
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