diff --git a/mix/qml/Block.qml b/mix/qml/Block.qml index 8fc282246..2f7d04a20 100644 --- a/mix/qml/Block.qml +++ b/mix/qml/Block.qml @@ -16,7 +16,7 @@ ColumnLayout property int number property int blockWidth: Layout.preferredWidth - statusWidth - horizontalMargin property int horizontalMargin: 10 - property int trHeight: 30 + property int trHeight: 35 spacing: 0 property int openedTr: 0 property int blockIndex @@ -42,6 +42,10 @@ ColumnLayout height = calculateHeight() } + DebuggerPaneStyle { + id: dbgStyle + } + RowLayout { Layout.preferredHeight: trHeight @@ -60,6 +64,7 @@ ColumnLayout anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: horizontalMargin + font.pointSize: dbgStyle.absoluteSize(1) color: "#adadad" text: { @@ -196,44 +201,61 @@ ColumnLayout { anchors.top: parent.top width: parent.width - spacing: 10 + spacing: 7 RowLayout { anchors.top: parent.top Layout.fillWidth: true spacing: cellSpacing - Text + Rectangle { - id: hash + Layout.preferredWidth: fromWidth anchors.left: parent.left anchors.leftMargin: horizontalMargin - Layout.preferredWidth: fromWidth - elide: Text.ElideRight - maximumLineCount: 1 - color: labelColor - text: { - if (index >= 0) - return transactions.get(index).sender - else - return "" + Text + { + id: hash + width: parent.width - 30 + elide: Text.ElideRight + anchors.verticalCenter: parent.verticalCenter + maximumLineCount: 1 + color: labelColor + font.pointSize: dbgStyle.absoluteSize(1) + font.bold: true + text: { + if (index >= 0) + return transactions.get(index).sender + else + return "" + } } } - Text + + Rectangle { - id: func - text: { - if (index >= 0) - parent.userFrienldyToken(transactions.get(index).label) - else - return "" - } - elide: Text.ElideRight - color: labelColor - maximumLineCount: 1 Layout.preferredWidth: toWidth + Text + { + id: func + text: { + if (index >= 0) + parent.parent.userFrienldyToken(transactions.get(index).label) + else + return "" + } + elide: Text.ElideRight + anchors.verticalCenter: parent.verticalCenter + color: labelColor + font.pointSize: dbgStyle.absoluteSize(1) + font.bold: true + maximumLineCount: 1 + width: parent.width + } } + + function userFrienldyToken(value) { if (value && value.indexOf("<") === 0) @@ -247,18 +269,25 @@ ColumnLayout return value } - Text + Rectangle { - id: returnValue - elide: Text.ElideRight - maximumLineCount: 1 - color: labelColor Layout.preferredWidth: valueWidth - text: { - if (index >= 0 && transactions.get(index).returned) - return transactions.get(index).returned - else - return "" + Text + { + id: returnValue + elide: Text.ElideRight + anchors.verticalCenter: parent.verticalCenter + maximumLineCount: 1 + color: labelColor + font.bold: true + font.pointSize: dbgStyle.absoluteSize(1) + width: parent.width -30 + text: { + if (index >= 0 && transactions.get(index).returned) + return transactions.get(index).returned + else + return "" + } } } @@ -272,8 +301,11 @@ ColumnLayout { id: logs anchors.left: parent.left + anchors.verticalCenter: parent.verticalCenter anchors.leftMargin: 10 color: labelColor + font.bold: true + font.pointSize: dbgStyle.absoluteSize(1) text: { if (index >= 0 && transactions.get(index).logs && transactions.get(index).logs.count) return transactions.get(index).logs.count @@ -288,8 +320,6 @@ ColumnLayout } } } - - } RowLayout @@ -329,8 +359,9 @@ ColumnLayout Rectangle { width: debugActionWidth - height: trHeight - 10 + height: trHeight anchors.left: rowContentTr.right + anchors.topMargin: -6 anchors.top: rowContentTr.top anchors.leftMargin: -50 color: "transparent" diff --git a/mix/qml/BlockChain.qml b/mix/qml/BlockChain.qml index 6467009da..b7411de16 100644 --- a/mix/qml/BlockChain.qml +++ b/mix/qml/BlockChain.qml @@ -40,16 +40,16 @@ ColumnLayout { if (width <= 630 || previousWidth <= 630) { - fromWidth = 100 + fromWidth = 150 toWidth = 100 - valueWidth = 250 + valueWidth = 200 } else { var diff = (width - previousWidth) / 3; - fromWidth = fromWidth + diff < 100 ? 100 : fromWidth + diff + fromWidth = fromWidth + diff < 150 ? 150 : fromWidth + diff toWidth = toWidth + diff < 100 ? 100 : toWidth + diff - valueWidth = valueWidth + diff < 250 ? 250 : valueWidth + diff + valueWidth = valueWidth + diff < 200 ? 200 : valueWidth + diff } previousWidth = width } @@ -68,9 +68,9 @@ ColumnLayout { } property int statusWidth: 50 - property int fromWidth: 100 + property int fromWidth: 150 property int toWidth: 100 - property int valueWidth: 250 + property int valueWidth: 200 property int logsWidth: 40 property int debugActionWidth: 40 property int horizontalMargin: 10 @@ -422,7 +422,6 @@ ColumnLayout { return; } } - // tr is not in the list. var itemTr = TransactionHelper.defaultTransaction() itemTr.saveStatus = false diff --git a/mix/qml/StateListModel.qml b/mix/qml/StateListModel.qml index 992113cc6..26817441c 100644 --- a/mix/qml/StateListModel.qml +++ b/mix/qml/StateListModel.qml @@ -256,6 +256,7 @@ Item { if (!_secret) _secret = clientModel.newSecret(); var address = clientModel.address(_secret); + console.log(address); var name = qsTr("Account") + "-" + address.substring(0, 4); return { name: name, secret: _secret, balance: QEtherHelper.createEther(_balance, _unit), address: address }; } diff --git a/mix/qml/WebPreview.qml b/mix/qml/WebPreview.qml index e4d0b61a5..c45f2cab4 100644 --- a/mix/qml/WebPreview.qml +++ b/mix/qml/WebPreview.qml @@ -89,10 +89,10 @@ Item { } } - Connections { + /*Connections { target: clientModel onRunComplete: reload(); - } + }*/ Connections { target: codeModel