tr dialog ui changes

microfins · Jun 24, 2015 · cb8886e · cb8886e
1 parent f2bcd94
commit cb8886e
Show file tree

Hide file tree

Showing 6 changed files with 112 additions and 132 deletions.
diff --git a/qml/Ether.qml b/qml/Ether.qml
@@ -54,6 +54,7 @@ RowLayout {
 	{
 		id: units
 		visible: displayUnitSelection;
+		implicitWidth: 145
 		onCurrentTextChanged:
 		{
 			if (value)

diff --git a/qml/QHashTypeView.qml b/qml/QHashTypeView.qml
@@ -13,22 +13,15 @@ Item
 		id: boldFont
 	}
 
-	Rectangle {
-		anchors.fill: parent
-		radius: 4
-		TextInput {
-			id: textinput
-			text: value
+	TextInput {
+		id: textinput
+		text: value
+		wrapMode: Text.WrapAnywhere
+		MouseArea {
+			id: mouseArea
 			anchors.fill: parent
-			wrapMode: Text.WrapAnywhere
-			clip: true
-			font.family: boldFont.name
-			MouseArea {
-				id: mouseArea
-				anchors.fill: parent
-				hoverEnabled: true
-				onClicked: textinput.forceActiveFocus()
-			}
+			hoverEnabled: true
+			onClicked: textinput.forceActiveFocus()
 		}
 	}
 }
diff --git a/qml/QIntTypeView.qml b/qml/QIntTypeView.qml
@@ -1,35 +1,26 @@
 import QtQuick 2.0
-
+import QtQuick.Controls 1.1
 Item
 {
 	property alias value: textinput.text
 	property alias readOnly: textinput.readOnly
 	id: editRoot
-	width: readOnly ? textinput.implicitWidth : 150
-
+	width: 200
 	DebuggerPaneStyle {
 		id: dbgStyle
 	}
 
-	Rectangle {
-		anchors.fill: parent
-		radius: 4
-		TextInput {
-			anchors.verticalCenter: parent.verticalCenter
-			id: textinput
-			font.family: dbgStyle.general.basicFont
-			clip: true
-			selectByMouse: true
-			text: value
+	TextField {
+		anchors.verticalCenter: parent.verticalCenter
+		id: textinput
+		selectByMouse: true
+		text: value
+		implicitWidth: 200
+		MouseArea {
+			id: mouseArea
 			anchors.fill: parent
-			font.pointSize: dbgStyle.general.basicFontSize
-			color: dbgStyle.general.basicColor
-			MouseArea {
-				id: mouseArea
-				anchors.fill: parent
-				hoverEnabled: true
-				onClicked: textinput.forceActiveFocus()
-			}
+			hoverEnabled: true
+			onClicked: textinput.forceActiveFocus()
 		}
 	}
 }
diff --git a/qml/QStringTypeView.qml b/qml/QStringTypeView.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.0
+import QtQuick.Controls 1.1
 
 Item
 {
@@ -11,25 +12,16 @@ Item
 		id: dbgStyle
 	}
 
-	Rectangle {
-		anchors.fill: parent
-		radius: 4
-		TextInput {
-			anchors.verticalCenter: parent.verticalCenter
-			id: textinput
-			font.family: dbgStyle.general.basicFont
-			clip: true
-			selectByMouse: true
-			text: value
+	TextField {
+		anchors.verticalCenter: parent.verticalCenter
+		id: textinput
+		selectByMouse: true
+		text: value
+		MouseArea {
+			id: mouseArea
 			anchors.fill: parent
-			font.pointSize: dbgStyle.general.basicFontSize
-			color: dbgStyle.general.basicColor
-			MouseArea {
-				id: mouseArea
-				anchors.fill: parent
-				hoverEnabled: true
-				onClicked: textinput.forceActiveFocus()
-			}
+			hoverEnabled: true
+			onClicked: textinput.forceActiveFocus()
 		}
 	}
 }

diff --git a/qml/StructView.qml b/qml/StructView.qml
@@ -13,15 +13,15 @@ Column
 	property int transactionIndex
 	property string context
 	Layout.fillWidth: true
-	spacing: 15
+	spacing: 5
 	Repeater
 	{
 		id: repeater
 		visible: model.length > 0
 		RowLayout
 		{
 			id: row
-			height: 20 + (members[index].type.category === QSolidityType.Struct ? (20 * members[index].type.members.length) : 0)
+			height: 30 + (members[index].type.category === QSolidityType.Struct ? (30 * members[index].type.members.length) : 0)
 			Layout.fillWidth: true
 			Rectangle
 			{
@@ -31,13 +31,11 @@ Column
 					anchors.right: parent.right
 					anchors.verticalCenter: parent.verticalCenter
 					Label {
-						height: 20
 						id: nameLabel
 						text: modelData.name
 					}
 
 					Label {
-						height: 20
 						id: typeLabel
 						text: " (" + modelData.type.name + ")"
 						font.italic: true
@@ -49,8 +47,6 @@ Column
 			Loader
 			{
 				id: typeLoader
-				height: 20
-				anchors.verticalCenter: parent.verticalCenter
 				sourceComponent:
 				{
 					var t = modelData.type.category;