diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-27 16:29:12 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-27 16:29:12 +0800 |
| commit | 474c85bc9d4b8ef88c933cf0fb9d58bf913f6cbe (patch) | |
| tree | 1d37eab24c24ee7d7aeac452047d0749b6926797 /ethereal/assets | |
| parent | f7eb4e587f83e4472e3d214076ba0c28102daefd (diff) | |
| parent | d694e00a3340a36c39872950bb7a2404e9686c18 (diff) | |
| download | dexon-474c85bc9d4b8ef88c933cf0fb9d58bf913f6cbe.tar dexon-474c85bc9d4b8ef88c933cf0fb9d58bf913f6cbe.tar.gz dexon-474c85bc9d4b8ef88c933cf0fb9d58bf913f6cbe.tar.bz2 dexon-474c85bc9d4b8ef88c933cf0fb9d58bf913f6cbe.tar.lz dexon-474c85bc9d4b8ef88c933cf0fb9d58bf913f6cbe.tar.xz dexon-474c85bc9d4b8ef88c933cf0fb9d58bf913f6cbe.tar.zst dexon-474c85bc9d4b8ef88c933cf0fb9d58bf913f6cbe.zip | |
Fix merge conflict
Diffstat (limited to 'ethereal/assets')
| -rw-r--r-- | ethereal/assets/qml/wallet.qml | 75 | ||||
| -rw-r--r-- | ethereal/assets/samplecoin/samplecoin.html | 2 |
2 files changed, 45 insertions, 32 deletions
diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index 81ad7ef24..f318ad173 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/ethereal/assets/qml/wallet.qml @@ -505,7 +505,7 @@ ApplicationWindow { } - Window { + ApplicationWindow { id: debugWindow visible: false title: "Debugger" @@ -543,36 +543,49 @@ ApplicationWindow { orientation: Qt.Vertical anchors.fill: parent - TableView { - property var memModel: ListModel { - id: memModel - } - height: parent.height/2 - width: parent.width - TableViewColumn{ id:mnumColmn ; role: "num" ; title: "#" ; width: 50} - TableViewColumn{ role: "value" ; title: "Memory" ; width: 750} - model: memModel - } - - SplitView { - orientation: Qt.Horizontal - TableView { - property var debuggerLog: ListModel { - id: debuggerLog - } - TableViewColumn{ role: "value"; title: "Debug messages" } - model: debuggerLog - } - TableView { - property var stackModel: ListModel { - id: stackModel - } - height: parent.height/2 - width: parent.width - TableViewColumn{ role: "value" ; title: "Stack"} - model: stackModel - } - } + TableView { + property var memModel: ListModel { + id: memModel + } + height: parent.height/2 + width: parent.width + TableViewColumn{ id:mnumColmn ; role: "num" ; title: "#" ; width: 50} + TableViewColumn{ role: "value" ; title: "Memory" ; width: 750} + model: memModel + } + + SplitView { + orientation: Qt.Horizontal + TableView { + property var debuggerLog: ListModel { + id: debuggerLog + } + TableViewColumn{ role: "value"; title: "Debug messages" } + model: debuggerLog + } + TableView { + property var stackModel: ListModel { + id: stackModel + } + height: parent.height/2 + width: parent.width + TableViewColumn{ role: "value" ; title: "Stack" ; width: parent.width } + model: stackModel + } + } + } + } + } + statusBar: StatusBar { + RowLayout { + anchors.fill: parent + Button { + property var enabled: true + id: debugNextButton + onClicked: { + ui.next() + } + text: "Next" } } } diff --git a/ethereal/assets/samplecoin/samplecoin.html b/ethereal/assets/samplecoin/samplecoin.html index 3892141cd..e780aefb4 100644 --- a/ethereal/assets/samplecoin/samplecoin.html +++ b/ethereal/assets/samplecoin/samplecoin.html @@ -9,7 +9,7 @@ <script type="text/javascript"> -var jefcoinAddr = "fc0a9436890478bb9b1c6ed7455c2535366f4a99" +var jefcoinAddr = "518546ffa883dcc838a64bc2dabada0fd64af459" var mAddr = "" function createTransaction() { |