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
efadfbfb
Commit
efadfbfb
authored
May 29, 2014
by
obscuren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor UI changes
* Moved log from block view * Prepend instead of append for logs
parent
8ee6574d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
17 deletions
+25
-17
debugger.qml
ethereal/assets/debugger/debugger.qml
+5
-1
wallet.qml
ethereal/assets/qml/wallet.qml
+16
-15
debugger.go
ethereal/ui/debugger.go
+1
-0
gui.go
ethereal/ui/gui.go
+3
-1
No files found.
ethereal/assets/debugger/debugger.qml
View file @
efadfbfb
...
...
@@ -255,6 +255,10 @@ ApplicationWindow {
}
function
setLog
(
msg
)
{
logModel
.
append
({
message
:
msg
})
logModel
.
insert
(
0
,
{
message
:
msg
})
}
function
clearLog
()
{
logModel
.
clear
()
}
}
ethereal/assets/qml/wallet.qml
View file @
efadfbfb
...
...
@@ -204,7 +204,7 @@ ApplicationWindow {
id
:
blockTable
width
:
parent
.
width
anchors.top
:
parent
.
top
anchors.bottom
:
logView
.
top
anchors.bottom
:
parent
.
bottom
TableViewColumn
{
role
:
"number"
;
title
:
"#"
;
width
:
100
}
TableViewColumn
{
role
:
"hash"
;
title
:
"Hash"
;
width
:
560
}
TableViewColumn
{
role
:
"txAmount"
;
title
:
"Tx amount"
;
width
:
100
}
...
...
@@ -217,19 +217,6 @@ ApplicationWindow {
}
}
property
var
logModel
:
ListModel
{
id
:
logModel
}
TableView
{
id
:
logView
width
:
parent
.
width
height
:
150
anchors.bottom
:
parent
.
bottom
TableViewColumn
{
role
:
"description"
;
title
:
"log"
}
model
:
logModel
}
}
Rectangle
{
...
...
@@ -257,6 +244,20 @@ ApplicationWindow {
text
:
pub
.
getKey
().
address
width
:
500
}
property
var
logModel
:
ListModel
{
id
:
logModel
}
TableView
{
id
:
logView
width
:
parent
.
width
height
:
200
anchors.bottom
:
parent
.
bottom
TableViewColumn
{
role
:
"description"
;
title
:
"log"
}
model
:
logModel
}
}
/*
...
...
@@ -690,7 +691,7 @@ ApplicationWindow {
function
addLog
(
str
)
{
if
(
str
.
len
!=
0
)
{
logModel
.
append
(
{
description
:
str
})
logModel
.
insert
(
0
,
{
description
:
str
})
}
}
...
...
ethereal/ui/debugger.go
View file @
efadfbfb
...
...
@@ -83,6 +83,7 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
dis
:=
ethchain
.
Disassemble
(
script
)
self
.
win
.
Root
()
.
Call
(
"clearAsm"
)
self
.
win
.
Root
()
.
Call
(
"clearLog"
)
for
_
,
str
:=
range
dis
{
self
.
win
.
Root
()
.
Call
(
"setAsm"
,
str
)
...
...
ethereal/ui/gui.go
View file @
efadfbfb
...
...
@@ -66,7 +66,6 @@ func (gui *Gui) Start(assetPath string) {
}})
ethutil
.
Config
.
SetClientString
(
fmt
.
Sprintf
(
"/Ethereal v%s"
,
version
))
ethutil
.
Config
.
Log
.
Infoln
(
"[GUI] Starting GUI"
)
// Create a new QML engine
gui
.
engine
=
qml
.
NewEngine
()
context
:=
gui
.
engine
.
Context
()
...
...
@@ -93,6 +92,9 @@ func (gui *Gui) Start(assetPath string) {
panic
(
err
)
}
ethutil
.
Config
.
Log
.
AddLogSystem
(
gui
)
ethutil
.
Config
.
Log
.
Infoln
(
"[GUI] Starting GUI"
)
win
.
Show
()
win
.
Wait
()
...
...
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