Updated QWhisper

* changed api
* general whisper debug interface

2 files changed, 38 insertions, 2 deletions

diff --git a/cmd/mist/assets/qml/views/whisper.qml b/cmd/mist/assets/qml/views/whisper.qml
index b50841ba5..b43ea4f8b 100644
--- a/cmd/mist/assets/qml/views/whisper.qml
+++ b/cmd/mist/assets/qml/views/whisper.qml
@@ -9,7 +9,7 @@ import Ethereum 1.0
 
 Rectangle {
 	id: root
-	property var title: "Whisper"
+	property var title: "Whisper Traffic"
 	property var iconSource: "../facet.png"
 	property var menuItem
 
@@ -21,10 +21,22 @@ Rectangle {
 		identity = shh.newIdentity()
 		console.log("New identity:", identity)
 
-		var t = shh.watch({topics: ["chat"]})
+		var t = shh.watch({}, root)
+	}
+
+	function onMessage(message) {
+		whisperModel.insert(0, {data: JSON.stringify({from: message.from, payload: eth.toAscii(message.payload)})})
 	}
 
 	RowLayout {
+		id: input
+		anchors {
+			left: parent.left
+			leftMargin: 20
+			top: parent.top
+			topMargin: 20
+		}
+
 		TextField {
 			id: to
 			placeholderText: "To"
@@ -44,4 +56,20 @@ Rectangle {
 			}
 		}
 	}
+
+	TableView {
+		id: txTableView
+		anchors {
+			top: input.bottom
+			topMargin: 10
+			bottom: parent.bottom
+			left: parent.left
+			right: parent.right
+		}
+		TableViewColumn{ role: "data" ; title: "Data" ; width: parent.width - 2 }
+
+		model: ListModel {
+			id: whisperModel
+		}
+	}
 }
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go
index 68f333563..fd4ffcb84 100644
--- a/cmd/mist/ui_lib.go
+++ b/cmd/mist/ui_lib.go
@@ -381,6 +381,14 @@ func (self *UiLib) ToHex(data string) string {
 	return "0x" + ethutil.Bytes2Hex([]byte(data))
 }
 
+func (self *UiLib) ToAscii(data string) string {
+	start := 0
+	if len(data) > 1 && data[0:2] == "0x" {
+		start = 2
+	}
+	return string(ethutil.Hex2Bytes(data[start:]))
+}
+
 /*
 // XXX Refactor me & MOVE
 func (self *Ethereum) InstallFilter(filter *core.Filter) (id int) {