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
72800572
Commit
72800572
authored
Sep 18, 2014
by
obscuren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor visual updates
parent
01863ebf
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
889 additions
and
906 deletions
+889
-906
wallet.qml
Mist/assets/qml/views/wallet.qml
+1
-1
wallet.qml
Mist/assets/qml/wallet.qml
+884
-905
types.go
javascript/types.go
+4
-0
No files found.
Mist/assets/qml/views/wallet.qml
View file @
72800572
...
@@ -9,7 +9,7 @@ import Ethereum 1.0
...
@@ -9,7 +9,7 @@ import Ethereum 1.0
Rectangle
{
Rectangle
{
id
:
root
id
:
root
property
var
title
:
"Wallet"
property
var
title
:
"Wallet"
property
var
iconSource
:
"../
wall
et.png"
property
var
iconSource
:
"../
fac
et.png"
property
var
menuItem
property
var
menuItem
objectName
:
"walletView"
objectName
:
"walletView"
...
...
Mist/assets/qml/wallet.qml
View file @
72800572
...
@@ -43,14 +43,14 @@ ApplicationWindow {
...
@@ -43,14 +43,14 @@ ApplicationWindow {
// Takes care of loading all default plugins
// Takes care of loading all default plugins
Component.onCompleted
:
{
Component.onCompleted
:
{
addPlugin
(
"./views/wallet.qml"
,
{
noAdd
:
tru
e
,
section
:
"ethereum"
,
active
:
true
});
addPlugin
(
"./views/wallet.qml"
,
{
noAdd
:
true
,
close
:
fals
e
,
section
:
"ethereum"
,
active
:
true
});
addPlugin
(
"./webapp.qml"
,
{
noAdd
:
tru
e
,
section
:
"ethereum"
,
active
:
true
});
addPlugin
(
"./webapp.qml"
,
{
noAdd
:
true
,
close
:
fals
e
,
section
:
"ethereum"
,
active
:
true
});
addPlugin
(
"./views/transaction.qml"
,
{
noAdd
:
tru
e
,
section
:
"legacy"
});
addPlugin
(
"./views/transaction.qml"
,
{
noAdd
:
true
,
close
:
fals
e
,
section
:
"legacy"
});
addPlugin
(
"./views/chain.qml"
,
{
noAdd
:
tru
e
,
section
:
"legacy"
});
addPlugin
(
"./views/chain.qml"
,
{
noAdd
:
true
,
close
:
fals
e
,
section
:
"legacy"
});
addPlugin
(
"./views/info.qml"
,
{
noAdd
:
tru
e
,
section
:
"legacy"
});
addPlugin
(
"./views/info.qml"
,
{
noAdd
:
true
,
close
:
fals
e
,
section
:
"legacy"
});
addPlugin
(
"./views/pending_tx.qml"
,
{
noAdd
:
tru
e
,
section
:
"legacy"
});
addPlugin
(
"./views/pending_tx.qml"
,
{
noAdd
:
true
,
close
:
fals
e
,
section
:
"legacy"
});
addPlugin
(
"./views/javascript.qml"
,
{
noAdd
:
tru
e
,
section
:
"legacy"
});
addPlugin
(
"./views/javascript.qml"
,
{
noAdd
:
true
,
close
:
fals
e
,
section
:
"legacy"
});
// Call the ready handler
// Call the ready handler
gui
.
done
();
gui
.
done
();
...
@@ -123,7 +123,7 @@ ApplicationWindow {
...
@@ -123,7 +123,7 @@ ApplicationWindow {
text
:
"Add plugin"
text
:
"Add plugin"
onTriggered
:
{
onTriggered
:
{
generalFileDialog
.
show
(
true
,
function
(
path
)
{
generalFileDialog
.
show
(
true
,
function
(
path
)
{
addPlugin
(
path
,
{
canC
lose
:
true
,
section
:
"apps"
})
addPlugin
(
path
,
{
c
lose
:
true
,
section
:
"apps"
})
})
})
}
}
}
}
...
@@ -392,6 +392,7 @@ ApplicationWindow {
...
@@ -392,6 +392,7 @@ ApplicationWindow {
id
:
menuItem
id
:
menuItem
property
var
view
;
property
var
view
;
property
var
path
;
property
var
path
;
property
var
closable
;
property
alias
title
:
label
.
text
property
alias
title
:
label
.
text
property
alias
icon
:
icon
.
source
property
alias
icon
:
icon
.
source
...
@@ -502,6 +503,8 @@ ApplicationWindow {
...
@@ -502,6 +503,8 @@ ApplicationWindow {
function
closeApp
()
{
function
closeApp
()
{
if
(
!
this
.
closable
)
{
return
;
}
if
(
this
.
view
.
hasOwnProperty
(
"onDestroy"
))
{
if
(
this
.
view
.
hasOwnProperty
(
"onDestroy"
))
{
this
.
view
.
onDestroy
.
call
(
this
.
view
)
this
.
view
.
onDestroy
.
call
(
this
.
view
)
}
}
...
@@ -536,19 +539,9 @@ ApplicationWindow {
...
@@ -536,19 +539,9 @@ ApplicationWindow {
comp
.
view
=
view
comp
.
view
=
view
comp
.
title
=
view
.
title
comp
.
title
=
view
.
title
comp
.
icon
=
view
.
iconSource
comp
.
icon
=
view
.
iconSource
/*
comp
.
closable
=
options
.
close
;
if(view.secondary !== undefined) {
comp.secondary = view.secondary
}
*/
return
comp
return
comp
/*
if(options.canClose) {
//comp.closeButton.visible = options.canClose
}
*/
}
}
ColumnLayout
{
ColumnLayout
{
...
@@ -655,7 +648,7 @@ ApplicationWindow {
...
@@ -655,7 +648,7 @@ ApplicationWindow {
}
}
Keys.onReturnPressed
:
{
Keys.onReturnPressed
:
{
addPlugin
(
this
.
text
,
{
canC
lose
:
true
,
section
:
"apps"
})
addPlugin
(
this
.
text
,
{
c
lose
:
true
,
section
:
"apps"
})
}
}
}
}
...
@@ -721,7 +714,7 @@ ApplicationWindow {
...
@@ -721,7 +714,7 @@ ApplicationWindow {
if
(
ext
==
"html"
||
ext
==
"htm"
)
{
if
(
ext
==
"html"
||
ext
==
"htm"
)
{
eth
.
openHtml
(
path
)
eth
.
openHtml
(
path
)
}
else
if
(
ext
==
"qml"
){
}
else
if
(
ext
==
"qml"
){
addPlugin
(
path
,
{
canC
lose
:
true
,
section
:
"apps"
})
addPlugin
(
path
,
{
c
lose
:
true
,
section
:
"apps"
})
}
}
}
}
...
@@ -815,8 +808,10 @@ ApplicationWindow {
...
@@ -815,8 +808,10 @@ ApplicationWindow {
Text
{
Text
{
anchors.left
:
aboutIcon
.
right
anchors.left
:
aboutIcon
.
right
anchors.leftMargin
:
10
anchors.leftMargin
:
10
anchors.top
:
parent
.
top
anchors.topMargin
:
40
font.pointSize
:
12
font.pointSize
:
12
text
:
"<h2>Ethereal - Aitne</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Maran Hidskes
<br>Viktor Trón<br>"
text
:
"<h2>Mist - Amalthea</h2><br><h3>Development</h3>Jeffrey Wilcke
<br>Viktor Trón<br>"
}
}
}
}
...
@@ -857,24 +852,8 @@ ApplicationWindow {
...
@@ -857,24 +852,8 @@ ApplicationWindow {
maximumWidth
:
300
maximumWidth
:
300
maximumHeight
:
50
maximumHeight
:
50
minimumHeight
:
50
minimumHeight
:
50
title
:
"Add
peer"
title
:
"Connect to
peer"
/*
TextField {
id: addrField
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.right: addPeerButton.left
anchors.leftMargin: 10
anchors.rightMargin: 10
placeholderText: "address:port"
text: "54.76.56.74:30303"
onAccepted: {
eth.connectToPeer(addrField.text)
addPeerWin.visible = false
}
}
*/
ComboBox
{
ComboBox
{
id
:
addrField
id
:
addrField
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
...
...
javascript/types.go
View file @
72800572
...
@@ -88,6 +88,10 @@ func (self *JSEthereum) GetStateObject(addr string) otto.Value {
...
@@ -88,6 +88,10 @@ func (self *JSEthereum) GetStateObject(addr string) otto.Value {
return
self
.
toVal
(
&
JSStateObject
{
ethpipe
.
NewJSObject
(
self
.
JSPipe
.
World
()
.
SafeGet
(
ethutil
.
Hex2Bytes
(
addr
))),
self
})
return
self
.
toVal
(
&
JSStateObject
{
ethpipe
.
NewJSObject
(
self
.
JSPipe
.
World
()
.
SafeGet
(
ethutil
.
Hex2Bytes
(
addr
))),
self
})
}
}
func
(
self
*
JSEthereum
)
Peers
()
otto
.
Value
{
return
self
.
toVal
(
self
.
JSPipe
.
Peers
())
}
func
(
self
*
JSEthereum
)
Transact
(
key
,
recipient
,
valueStr
,
gasStr
,
gasPriceStr
,
dataStr
string
)
otto
.
Value
{
func
(
self
*
JSEthereum
)
Transact
(
key
,
recipient
,
valueStr
,
gasStr
,
gasPriceStr
,
dataStr
string
)
otto
.
Value
{
r
,
err
:=
self
.
JSPipe
.
Transact
(
key
,
recipient
,
valueStr
,
gasStr
,
gasPriceStr
,
dataStr
)
r
,
err
:=
self
.
JSPipe
.
Transact
(
key
,
recipient
,
valueStr
,
gasStr
,
gasPriceStr
,
dataStr
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
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