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
34e2ab9f
Commit
34e2ab9f
authored
Jul 18, 2014
by
obscuren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added block update
parent
44296c0b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
23 deletions
+47
-23
wallet.qml
ethereal/assets/qml/wallet.qml
+32
-20
debugger.go
ethereal/debugger.go
+3
-0
gui.go
ethereal/gui.go
+12
-3
No files found.
ethereal/assets/qml/wallet.qml
View file @
34e2ab9f
...
...
@@ -419,6 +419,17 @@ ApplicationWindow {
}
}
Label
{
y
:
6
id
:
lastBlockLabel
objectName
:
"lastBlockLabel"
visible
:
true
text
:
""
font.pixelSize
:
10
anchors.right
:
peerGroup
.
left
anchors.rightMargin
:
5
}
ProgressBar
{
id
:
syncProgressIndicator
visible
:
false
...
...
@@ -426,29 +437,30 @@ ApplicationWindow {
y
:
3
width
:
140
indeterminate
:
true
anchors.right
:
peer
Label
.
left
anchors.right
:
peer
Group
.
left
anchors.rightMargin
:
5
}
Label
{
y
:
7
anchors.right
:
peerImage
.
left
anchors.rightMargin
:
5
id
:
peerLabel
font.pixelSize
:
8
text
:
"0 / 0"
}
Image
{
y
:
7
id
:
peerImage
anchors.right
:
parent
.
right
width
:
10
;
height
:
10
MouseArea
{
onDoubleClicked
:
peerWindow
.
visible
=
true
anchors.fill
:
parent
}
source
:
"../network.png"
}
RowLayout
{
id
:
peerGroup
y
:
7
anchors.right
:
parent
.
right
MouseArea
{
onDoubleClicked
:
peerWindow
.
visible
=
true
anchors.fill
:
parent
}
Label
{
id
:
peerLabel
font.pixelSize
:
8
text
:
"0 / 0"
}
Image
{
id
:
peerImage
width
:
10
;
height
:
10
source
:
"../network.png"
}
}
}
Window
{
...
...
ethereal/debugger.go
View file @
34e2ab9f
...
...
@@ -17,6 +17,8 @@ type DebuggerWindow struct {
vm
*
ethchain
.
Vm
Db
*
Debugger
state
*
ethchain
.
State
}
func
NewDebuggerWindow
(
lib
*
UiLib
)
*
DebuggerWindow
{
...
...
@@ -53,6 +55,7 @@ func (self *DebuggerWindow) SetCode(code string) {
func
(
self
*
DebuggerWindow
)
SetData
(
data
string
)
{
self
.
win
.
Set
(
"dataText"
,
data
)
}
func
(
self
*
DebuggerWindow
)
SetAsm
(
data
[]
byte
)
{
self
.
win
.
Root
()
.
Call
(
"clearAsm"
)
...
...
ethereal/gui.go
View file @
34e2ab9f
...
...
@@ -266,6 +266,10 @@ func (gui *Gui) setWalletValue(amount, unconfirmedFunds *big.Int) {
gui
.
win
.
Root
()
.
Call
(
"setWalletValue"
,
str
)
}
func
(
self
*
Gui
)
getObjectByName
(
objectName
string
)
qml
.
Object
{
return
self
.
win
.
Root
()
.
ObjectByName
(
objectName
)
}
// Simple go routine function that updates the list of peers in the GUI
func
(
gui
*
Gui
)
update
()
{
reactor
:=
gui
.
eth
.
Reactor
()
...
...
@@ -289,13 +293,16 @@ func (gui *Gui) update() {
}
reactor
.
Subscribe
(
"peerList"
,
peerChan
)
ticker
:=
time
.
NewTicker
(
5
*
time
.
Second
)
peerUpdateTicker
:=
time
.
NewTicker
(
5
*
time
.
Second
)
generalUpdateTicker
:=
time
.
NewTicker
(
1
*
time
.
Second
)
state
:=
gui
.
eth
.
StateManager
()
.
TransState
()
unconfirmedFunds
:=
new
(
big
.
Int
)
gui
.
win
.
Root
()
.
Call
(
"setWalletValue"
,
fmt
.
Sprintf
(
"%v"
,
ethutil
.
CurrencyToString
(
state
.
GetAccount
(
gui
.
address
())
.
Amount
)))
gui
.
win
.
Root
()
.
ObjectByName
(
"syncProgressIndicator"
)
.
Set
(
"visible"
,
!
gui
.
eth
.
IsUpToDate
())
gui
.
getObjectByName
(
"syncProgressIndicator"
)
.
Set
(
"visible"
,
!
gui
.
eth
.
IsUpToDate
())
lastBlockLabel
:=
gui
.
getObjectByName
(
"lastBlockLabel"
)
for
{
select
{
...
...
@@ -345,8 +352,10 @@ func (gui *Gui) update() {
gui
.
loadAddressBook
()
case
<-
peerChan
:
gui
.
setPeerInfo
()
case
<-
t
icker
.
C
:
case
<-
peerUpdateT
icker
.
C
:
gui
.
setPeerInfo
()
case
<-
generalUpdateTicker
.
C
:
lastBlockLabel
.
Set
(
"text"
,
"#"
+
gui
.
eth
.
BlockChain
()
.
CurrentBlock
.
Number
.
String
())
}
}
}
...
...
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