Skip to content

Commit

Permalink
Merge pull request ethereum#250 from LianaHus/develop
Browse files Browse the repository at this point in the history
debug button
  • Loading branch information
chriseth committed Feb 22, 2016
2 parents 848fe37 + 4fa1a78 commit 1f4349b
Show file tree
Hide file tree
Showing 8 changed files with 74 additions and 43 deletions.
2 changes: 2 additions & 0 deletions qml.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,7 @@
<file>qml/WelcomeView.qml</file>
<file>qml/DefaultCompleteButton.qml</file>
<file>qml/WelcomeViewStyle.qml</file>
<file>qml/img/panelopen.png</file>
<file>qml/img/panelclose.png</file>
</qresource>
</RCC>
1 change: 1 addition & 0 deletions qml/BlockChain.qml
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,7 @@ ColumnLayout {
id: block
scenario: blockChainPanel.model
Layout.preferredWidth: blockChainScrollView.width

blockIndex: index
transactions:
{
Expand Down
1 change: 0 additions & 1 deletion qml/Folder.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import QtQuick.Dialogs 1.2
import "."

ColumnLayout {

id: wrapperItem
signal documentSelected(string doc, string groupName)
property alias model: filesList.model
Expand Down
1 change: 0 additions & 1 deletion qml/ScenarioExecution.qml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ Rectangle {

ScenarioButton
{

Image {
anchors.left: parent.left
source: loader.visible ? "qrc:/qml/img/down.png" : "qrc:/qml/img/right.png"
Expand Down
39 changes: 20 additions & 19 deletions qml/StatusPane.qml
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,8 @@ Rectangle {
z: 3
style:
ButtonStyle {
background:Rectangle {
color: "transparent"
background:Rectangle {
color: "transparent"
}
}
MouseArea {
Expand Down Expand Up @@ -501,28 +501,29 @@ Rectangle {
Rectangle
{
color: "transparent"
width: 100
height: parent.height
anchors.top: parent.top
width: parent.height * 0.8
height: parent.height * 0.6
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
RowLayout
DefaultImgButton
{
anchors.fill: parent
Rectangle
{
color: "transparent"
anchors.right: parent.right
style:
ButtonStyle {
background:Rectangle {
color: "transparent"
}
}
anchors.verticalCenter: parent.verticalCenter
id: debugImg
text: ""
Image {
id: panelOpen
source: rightViewIsVisible() ? "qrc:/qml/img/panelclose.png" : "qrc:/qml/img/panelopen.png"
anchors.fill: parent
DefaultImgButton
{
anchors.right: parent.right
anchors.rightMargin: 9
anchors.verticalCenter: parent.verticalCenter
id: debugImg
text: ""
iconSource: "qrc:/qml/img/bugiconactive.png"
action: showHideRightPanelAction
}
}
action: showHideRightPanelAction
}
}
}
73 changes: 51 additions & 22 deletions qml/Transaction.qml
Original file line number Diff line number Diff line change
Expand Up @@ -243,12 +243,12 @@ ColumnLayout
DefaultText
{
id: hash
Layout.preferredWidth: (parent.width / 2) - 50
Layout.preferredWidth: (parent.width / 2) - 80
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: horizontalMargin
elide: Text.ElideRight
width: parent.width - 50
width: parent.width - 80
maximumLineCount: 1
clip: true
color: labelColor
Expand All @@ -263,7 +263,7 @@ ColumnLayout

Rectangle
{
Layout.preferredWidth: 60
Layout.preferredWidth: 30
DefaultLabel
{
anchors.horizontalCenter: parent.horizontalCenter
Expand Down Expand Up @@ -318,31 +318,60 @@ ColumnLayout
}
}

Rectangle
RowLayout
{
width: 15
height: 15
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: 10
color: "transparent"
Image {
id: debugImg
source: txDetail.visible ? "qrc:/qml/img/[email protected]" : "qrc:/qml/img/[email protected]"
width: parent.width
fillMode: Image.PreserveAspectFit
anchors.horizontalCenter: parent.horizontalCenter
visible: tx !== null && tx !== undefined && tx.recordIndex !== undefined
MouseArea

DefaultButton
{
width: 15
height: 15
id: debugTxButton
anchors.verticalCenter: parent.verticalCenter
Layout.preferredWidth: 30
Layout.preferredHeight: 30
style: ButtonStyle
{
id: name
label: Image { source: "qrc:/qml/img/bugiconactive.png" }
}
TooltipArea {
text: qsTr("Debug transaction")
anchors.fill: parent
onClicked:
{
txDetail.visible = !txDetail.visible
if (txDetail.visible)
colDetail.updateContainerHeight()
else
txDetail.Layout.preferredHeight = 0
if (tx.recordIndex !== undefined)
clientModel.debugRecord(tx.recordIndex, tx.label);
}
}
}
Rectangle
{
width: 15
height: 15
color: "transparent"
TooltipArea {
text: qsTr("Expand transaction")
anchors.fill: parent
}
Image {
id: expandImg
source: txDetail.visible ? "qrc:/qml/img/[email protected]" : "qrc:/qml/img/[email protected]"
width: parent.width
fillMode: Image.PreserveAspectFit
anchors.horizontalCenter: parent.horizontalCenter
visible: tx !== null && tx !== undefined && tx.recordIndex !== undefined
MouseArea
{
anchors.fill: parent
onClicked:
{
txDetail.visible = !txDetail.visible
if (txDetail.visible)
colDetail.updateContainerHeight()
else
txDetail.Layout.preferredHeight = 0
}
}
}
}
Expand Down
Binary file added qml/img/panelclose.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added qml/img/panelopen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1f4349b

Please sign in to comment.