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
465b0a79
Commit
465b0a79
authored
Jan 21, 2015
by
obscuren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated browser & pass view to callback function
parent
87f50659
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
245 additions
and
231 deletions
+245
-231
browser.qml
cmd/mist/assets/qml/browser.qml
+242
-229
ui_lib.go
cmd/mist/ui_lib.go
+3
-2
No files found.
cmd/mist/assets/qml/browser.qml
View file @
465b0a79
...
@@ -152,15 +152,17 @@ Rectangle {
...
@@ -152,15 +152,17 @@ Rectangle {
color
:
"#CCCCCC"
color
:
"#CCCCCC"
}
}
WebView
{
ScrollView
{
objectName
:
"webView"
id
:
webview
anchors
{
anchors
{
left
:
parent
.
left
left
:
parent
.
left
right
:
parent
.
right
right
:
parent
.
right
bottom
:
parent
.
bottom
bottom
:
parent
.
bottom
top
:
divider
.
bottom
top
:
divider
.
bottom
}
}
WebView
{
objectName
:
"webView"
id
:
webview
anchors.fill
:
parent
function
injectJs
(
js
)
{
function
injectJs
(
js
)
{
webview
.
experimental
.
navigatorQtObjectEnabled
=
true
;
webview
.
experimental
.
navigatorQtObjectEnabled
=
true
;
...
@@ -172,9 +174,22 @@ Rectangle {
...
@@ -172,9 +174,22 @@ Rectangle {
webview
.
experimental
.
postMessage
(
JSON
.
stringify
(
data
))
webview
.
experimental
.
postMessage
(
JSON
.
stringify
(
data
))
}
}
Component.onCompleted
:
{
for
(
var
i
in
experimental
.
preferences
)
{
console
.
log
(
i
)
}
}
experimental
.
preferences
.
javascriptEnabled
:
true
experimental
.
preferences
.
javascriptEnabled
:
true
experimental
.
preferences
.
webAudioEnabled
:
true
experimental
.
preferences
.
pluginsEnabled
:
true
experimental
.
preferences
.
navigatorQtObjectEnabled
:
true
experimental
.
preferences
.
developerExtrasEnabled
:
true
experimental
.
preferences
.
webGLEnabled
:
true
experimental
.
preferences
.
webGLEnabled
:
true
experimental
.
preferences
.
notificationsEnabled
:
true
experimental
.
preferences
.
localStorageEnabled
:
true
experimental
.
userAgent
:
"Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Mist/0.1 Safari/537.36"
experimental
.
itemSelector
:
MouseArea
{
experimental
.
itemSelector
:
MouseArea
{
// To avoid conflicting with ListView.model when inside Initiator context.
// To avoid conflicting with ListView.model when inside Initiator context.
property
QtObject
selectorModel
:
model
property
QtObject
selectorModel
:
model
...
@@ -202,9 +217,6 @@ Rectangle {
...
@@ -202,9 +217,6 @@ Rectangle {
itemSelector
.
popup
()
itemSelector
.
popup
()
}
}
}
}
experimental.preferences.webAudioEnabled
:
true
experimental.preferences.navigatorQtObjectEnabled
:
true
experimental.preferences.developerExtrasEnabled
:
true
experimental.userScripts
:
[
"../ext/q.js"
,
"../ext/ethereum.js/lib/web3.js"
,
"../ext/ethereum.js/lib/qt.js"
,
"../ext/setup.js"
]
experimental.userScripts
:
[
"../ext/q.js"
,
"../ext/ethereum.js/lib/web3.js"
,
"../ext/ethereum.js/lib/qt.js"
,
"../ext/setup.js"
]
experimental.onMessageReceived
:
{
experimental.onMessageReceived
:
{
console
.
log
(
"[onMessageReceived]: "
,
message
.
data
)
console
.
log
(
"[onMessageReceived]: "
,
message
.
data
)
...
@@ -446,6 +458,7 @@ Rectangle {
...
@@ -446,6 +458,7 @@ Rectangle {
postEvent
(
ev
,
[
storageObject
.
address
,
storageObject
.
value
])
postEvent
(
ev
,
[
storageObject
.
address
,
storageObject
.
value
])
}
}
}
}
}
Rectangle
{
Rectangle
{
...
...
cmd/mist/ui_lib.go
View file @
465b0a79
...
@@ -312,10 +312,11 @@ func (self *UiLib) ToAscii(data string) string {
...
@@ -312,10 +312,11 @@ func (self *UiLib) ToAscii(data string) string {
}
}
/// Ethereum filter methods
/// Ethereum filter methods
func
(
self
*
UiLib
)
NewFilter
(
object
map
[
string
]
interface
{})
(
id
int
)
{
func
(
self
*
UiLib
)
NewFilter
(
object
map
[
string
]
interface
{}
,
view
*
qml
.
Common
)
(
id
int
)
{
filter
:=
qt
.
NewFilterFromMap
(
object
,
self
.
eth
)
filter
:=
qt
.
NewFilterFromMap
(
object
,
self
.
eth
)
filter
.
MessageCallback
=
func
(
messages
state
.
Messages
)
{
filter
.
MessageCallback
=
func
(
messages
state
.
Messages
)
{
self
.
win
.
Root
()
.
Call
(
"invokeFilterCallback"
,
xeth
.
ToJSMessages
(
messages
),
id
)
view
.
Call
(
"messages"
,
xeth
.
ToJSMessages
(
messages
),
id
)
//self.win.Root().Call("invokeFilterCallback", xeth.ToJSMessages(messages), id)
}
}
id
=
self
.
filterManager
.
InstallFilter
(
filter
)
id
=
self
.
filterManager
.
InstallFilter
(
filter
)
return
id
return
id
...
...
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