- Add SourceSansPro*.qml

- Ui changes on state/transaction dialog

mix/QEther.cpp

@@ -35,7 +35,7 @@ QBigInt* QEther::toWei() const
 	const char* key = units.valueToKey(m_currentUnit);
 	for (std::pair<dev::u256, std::string> rawUnit: dev::eth::units())
 	{
-		if (rawUnit.second == QString(key).toLower().toStdString())
+		if (QString::fromStdString(rawUnit.second).toLower() == QString(key).toLower())
 			return multiply(new QBigInt(rawUnit.first));
 	}
 	return new QBigInt(dev::u256(0));
@@ -46,7 +46,7 @@ void QEther::setUnit(QString const& _unit)
 	QMetaEnum units = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("EtherUnit"));
 	for (int k = 0; k < units.keyCount(); k++)
 	{
-		if (QString(units.key(k)).toLower() == _unit)
+		if (QString(units.key(k)).toLower() == _unit.toLower())
 		{
 			m_currentUnit = static_cast<EtherUnit>(units.keysToValue(units.key(k)));
 			return;

mix/qml/Ether.qml

@@ -32,6 +32,11 @@ RowLayout {
 		units.currentIndex = unit;
 	}
 
+	SourceSansProRegular
+	{
+		id: regularFont
+	}
+
 	TextField
 	{
 		implicitWidth: 200
@@ -46,6 +51,7 @@ RowLayout {
 		readOnly: !edit
 		visible: edit
 		id: etherValueEdit;
+		font.family: regularFont.name
 	}
 
 	ComboBox
@@ -81,10 +87,15 @@ RowLayout {
 			ListElement { text: "Kwei"; }
 			ListElement { text: "wei"; }
 		}
+		style: ComboBoxStyle
+		{
+		font: regularFont.name
+		}
 	}
 	Text
 	{
 		visible: displayFormattedValue
 		id: formattedValue
+		font.family: regularFont.name
 	}
 }

mix/qml/FilesSection.qml

@@ -48,16 +48,14 @@ ColumnLayout {
 			model.remove(i);
 	}
 
-	FontLoader
+	SourceSansProRegular
 	{
 		id: fileNameFont
-		source: "qrc:/qml/fonts/SourceSansPro-Regular.ttf"
 	}
 
-	FontLoader
+	SourceSansProBold
 	{
 		id: boldFont
-		source: "qrc:/qml/fonts/SourceSansPro-Bold.ttf"
 	}
 
 	RowLayout

mix/qml/ProjectList.qml

@@ -12,10 +12,10 @@ Item {
 		anchors.fill: parent
 		id: filesCol
 		spacing: 0
-		FontLoader
+
+		SourceSansProLight
 		{
 			id: srcSansProLight
-			source: "qrc:/qml/fonts/SourceSansPro-Light.ttf"
 		}
 
 		Rectangle

mix/qml/QHashTypeView.qml

@@ -4,6 +4,12 @@ Item
 {
 	property alias text: textinput.text
 	id: editRoot
+
+	SourceSansProBold
+	{
+		id: boldFont
+	}
+
 	Rectangle {
 		anchors.fill: parent
 		TextInput {
@@ -11,6 +17,7 @@ Item
 			text: text
 			anchors.fill: parent
 			wrapMode: Text.WrapAnywhere
+			font.family: boldFont.name
 			MouseArea {
 				id: mouseArea
 				anchors.fill: parent

mix/qml/QIntTypeView.qml

@@ -4,12 +4,19 @@ Item
 {
 	property alias text: textinput.text
 	id: editRoot
+
+	SourceSansProBold
+	{
+		id: boldFont
+	}
+
 	Rectangle {
 		anchors.fill: parent
 		TextInput {
 			id: textinput
 			text: text
 			anchors.fill: parent
+			font.family: boldFont.name
 			MouseArea {
 				id: mouseArea
 				anchors.fill: parent

mix/qml/QStringTypeView.qml

@@ -4,6 +4,12 @@ Item
 {
 	property alias text: textinput.text
 	id: editRoot
+
+	SourceSansProBold
+	{
+		id: boldFont
+	}
+
 	Rectangle {
 		anchors.fill: parent
 		TextInput {
@@ -11,6 +17,7 @@ Item
 			text: text
 			anchors.fill: parent
 			wrapMode: Text.WrapAnywhere
+			font.family: boldFont.name
 			MouseArea {
 				id: mouseArea
 				anchors.fill: parent

mix/qml/SourceSansProBold.qml

@@ -0,0 +1,6 @@
+import QtQuick 2.0
+
+FontLoader
+{
+	source: "qrc:/qml/fonts/SourceSansPro-Bold.ttf"
+}

mix/qml/SourceSansProLight.qml

@@ -0,0 +1,7 @@
+import QtQuick 2.0
+
+FontLoader
+{
+	source: "qrc:/qml/fonts/SourceSansPro-Light.ttf"
+}
+

mix/qml/SourceSansProRegular.qml

@@ -0,0 +1,8 @@
+import QtQuick 2.0
+
+FontLoader
+{
+	source: "qrc:/qml/fonts/SourceSansPro-Regular.ttf"
+}
+
+

mix/qml/StateDialog.qml

@@ -2,9 +2,11 @@ import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.0
+import QtQuick.Controls.Styles 1.3
 import org.ethereum.qml.QEther 1.0
 import "js/QEtherHelper.js" as QEtherHelper
 import "js/TransactionHelper.js" as TransactionHelper
+import "."
 
 Window {
 	id: modalStateDialog
@@ -14,6 +16,7 @@ Window {
 	height: 480
 
 	visible: false
+	color: StateDialogStyle.generic.backgroundColor
 
 	property alias stateTitle: titleField.text
 	property alias stateBalance: balanceField.value
@@ -53,25 +56,39 @@ Window {
 		return item;
 	}
 
+	SourceSansProRegular
+	{
+		id: regularFont
+	}
+
+	Rectangle
+	{
+		anchors.fill: parent
+		anchors.margins: 10
+		color: StateDialogStyle.generic.backgroundColor
 		GridLayout {
 			id: dialogContent
 			columns: 2
-		anchors.fill: parent
+			anchors.top: parent.top
-		anchors.margins: 10
 			rowSpacing: 10
 			columnSpacing: 10
 
 			Label {
 				text: qsTr("Title")
+				font.family: regularFont.name
+				color: "#808080"
 			}
 			TextField {
 				id: titleField
 				focus: true
 				Layout.fillWidth: true
+				font.family: regularFont.name
 			}
 
 			Label {
 				text: qsTr("Balance")
+				font.family: regularFont.name
+				color: "#808080"
 			}
 			Ether {
 				id: balanceField
@@ -82,28 +99,51 @@ Window {
 
 			Label {
 				text: qsTr("Default")
+				font.family: regularFont.name
+				color: "#808080"
 			}
 			CheckBox {
 				id: defaultCheckBox
 				Layout.fillWidth: true
 			}
+		}
 
+		ColumnLayout
+		{
+			width: parent.width
+			anchors.top: dialogContent.bottom
+			anchors.topMargin: 5
+			spacing: 5
 			Label {
 				text: qsTr("Transactions")
+				font.family: regularFont.name
+				color: "#808080"
 			}
+
 			ListView {
-			Layout.fillWidth: true
+				id: trList
+				Layout.preferredWidth: 200
 				Layout.fillHeight: true
+				Layout.minimumHeight: 20 * transactionsModel.count
 				model: transactionsModel
 				delegate: transactionRenderDelegate
+				visible: transactionsModel.count > 0
 			}
 
-		Label {
+			ToolButton {
-
-		}
-		Button {
-			text: qsTr("Add")
 				onClicked: transactionsModel.addTransaction()
+				style: ButtonStyle
+				{
+				 label: Text {
+					 font.family: regularFont.name
+					 text: qsTr("+")
+					 font.pointSize: 20
+					 color: "#808080"
+				 }
+				 background: Rectangle {
+					 color: "transparent"
+				 }
+				}
 			}
 		}
 
@@ -123,6 +163,10 @@ Window {
 			onClicked: close();
 		}
 	}
+}
+
+
+
 
 	ListModel {
 		id: transactionsModel
@@ -160,18 +204,43 @@ Window {
 					text: functionId
 					font.pointSize: 12
 					verticalAlignment: Text.AlignBottom
+					font.family: regularFont.name
 				}
 				ToolButton {
 					text: qsTr("Edit");
 					visible: !stdContract
 					Layout.fillHeight: true
 					onClicked: transactionsModel.editTransaction(index)
+					style: ButtonStyle
+					{
+					 label: Text {
+						 font.family: regularFont.name
+						 text: qsTr("Edit")
+						 font.italic: true
+						 font.pointSize: 9
+					 }
+					 background: Rectangle {
+						 color: "transparent"
+					 }
+					}
 				}
 				ToolButton {
 					visible: index >= 0 ? !transactionsModel.get(index).executeConstructor : false
 					text: qsTr("Delete");
 					Layout.fillHeight: true
 					onClicked: transactionsModel.deleteTransaction(index)
+					style: ButtonStyle
+					{
+					 label: Text {
+						 font.family: regularFont.name
+						 text: qsTr("Delete")
+						 font.italic: true
+						 font.pointSize: 9
+					 }
+					 background: Rectangle {
+						 color: "transparent"
+					 }
+					}
 				}
 			}
 		}

mix/qml/StateDialogStyle.qml

@@ -0,0 +1,17 @@
+pragma Singleton
+import QtQuick 2.0
+
+QtObject {
+	property QtObject generic: QtObject
+	{
+		property string backgroundColor: "#ededed"
+	}
+
+	property QtObject stateDialog: QtObject
+	{
+	}
+
+	property QtObject transactionDialog: QtObject
+	{
+	}
+}

mix/qml/TransactionDialog.qml

@@ -2,15 +2,18 @@ import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.0
+import QtQuick.Controls.Styles 1.3
 import org.ethereum.qml.QEther 1.0
 import "js/TransactionHelper.js" as TransactionHelper
+import "."
 
 Window {
 	id: modalTransactionDialog
 	modality: Qt.WindowModal
-	width:640
+	width: 640
-	height:640
+	height: 700
 	visible: false
+	color: StateDialogStyle.generic.backgroundColor
 
 	property int transactionIndex
 	property alias transactionParams: paramsModel;
@@ -155,11 +158,17 @@ Window {
 		return item;
 	}
 
+	SourceSansProRegular
+	{
+		id: regularFont
+	}
+
 	ColumnLayout {
 		id: dialogContent
 		width: parent.width
 		anchors.left: parent.left
 		anchors.right: parent.right
+		anchors.top: parent.top
 		anchors.margins: 10
 		spacing: 30
 		RowLayout
@@ -170,10 +179,12 @@ Window {
 			Label {
 				Layout.preferredWidth: 75
 				text: qsTr("Function")
+				font.family: regularFont.name
+				color: "#808080"
 			}
 			ComboBox {
 				id: functionComboBox
-				Layout.fillWidth: true
+				Layout.preferredWidth: 350
 				currentIndex: -1
 				textRole: "text"
 				editable: false
@@ -183,6 +194,10 @@ Window {
 				onCurrentIndexChanged: {
 					loadParameters();
 				}
+				style: ComboBoxStyle
+				{
+				font: regularFont.name
+				}
 			}
 		}
 
@@ -191,70 +206,190 @@ Window {
 		{
 			id: rowValue
 			Layout.fillWidth: true
+			height: 150
 			Label {
 				Layout.preferredWidth: 75
 				text: qsTr("Value")
+				font.family: regularFont.name
+				color: "#808080"
 			}
-			Rectangle
-			{
-				Layout.fillWidth: true
 			Ether {
 				id: valueField
 				edit: true
 				displayFormattedValue: true
 			}
 		}
-		}
 
 
 		RowLayout
 		{
 			id: rowGas
 			Layout.fillWidth: true
+			height: 150
 			Label {
 				Layout.preferredWidth: 75
 				text: qsTr("Gas")
+				font.family: regularFont.name
+				color: "#808080"
 			}
-			Rectangle
-			{
-				Layout.fillWidth: true
 			Ether {
 				id: gasField
 				edit: true
 				displayFormattedValue: true
 			}
 		}
-		}
 
 		RowLayout
 		{
 			id: rowGasPrice
 			Layout.fillWidth: true
+			height: 150
 			Label {
 				Layout.preferredWidth: 75
 				text: qsTr("Gas Price")
+				font.family: regularFont.name
+				color: "#808080"
 			}
-			Rectangle
-			{
-				Layout.fillWidth: true
 			Ether {
 				id: gasPriceField
 				edit: true
 				displayFormattedValue: true
 			}
 		}
+
+			//ColumnLayout
+			//{
+				//Layout.fillHeight: true;
+				//Layout.fillWidth: true;
+				//visible: paramsModel.count > 0
+
+				Label {
+					text: qsTr("Parameters")
+					Layout.preferredWidth: 75
+					font.family: regularFont.name
+					color: "#808080"
+					visible: paramsModel.count > 0
 				}
 
-		RowLayout
+				Repeater
+				{
+					model: paramsModel
+					visible: paramsModel.count > 0
+					Rectangle
 					{
+						color: "transparent"
 						Layout.fillWidth: true
+						height: 150
 						Label {
-				text: qsTr("Parameters")
+							id: typeLabel
-				Layout.preferredWidth: 75
+							text: type
+						}
+
+						Label {
+							anchors.left: typeLabel.right
+							id: nameLabel
+							text: name
+						}
+
+						Label {
+							anchors.left: nameLabel.right
+							id: equalLabel
+							text: "="
+						}
+
+						Loader
+						{
+							anchors.left: equalLabel.right
+							id: typeLoader
+							height: 50
+							width: 150
+							Connections {
+								target: typeLoader.item
+								onTextChanged: {
+									console.log("text changed 0 " + value);
+									value = typeLoader.item.text;
+									console.log("text changed 1 " + value);
+								}
+							}
+
+							sourceComponent:
+							{
+								console.log(type);
+								if (type.indexOf("int") !== -1)
+									return intViewComp;
+								else if (type.indexOf("bool") !== -1)
+									return boolViewComp;
+								else if (type.indexOf("string") !== -1)
+									return stringViewComp;
+								else if (type.indexOf("hash") !== -1)
+									return hashViewComp;
+								else
+									return null;
+							}
+
+							Component
+							{
+								id: intViewComp
+								QIntTypeView
+								{
+									height: 50
+									width: 150
+									id: intView
+									text: value
+								}
+							}
+
+							Component
+							{
+								id: boolViewComp
+								QBoolTypeView
+								{
+									height: 50
+									width: 150
+									id: boolView
+									defaultValue: "1"
+									Component.onCompleted:
+									{
+										/*loaderEditor.updateValue(styleData.row, styleData.role,
+															 (paramsModel.get(styleData.row).value === "" ? defaultValue :
+																											paramsModel.get(styleData.row).value));
+									text = (paramsModel.get(styleData.row).value === "" ? defaultValue : paramsModel.get(styleData.row).value);*/
+									}
+								}
+							}
+
+							Component
+							{
+								id: stringViewComp
+								QStringTypeView
+								{
+									height: 50
+									width: 150
+									id: stringView
+									text: value
+								}
+							}
+
+							Component
+							{
+								id: hashViewComp
+								QHashTypeView
+								{
+									height: 50
+									width: 150
+									id: hashView
+									text: value
+								}
+							}
+						}
+
+					}
 				}
-			TableView {
+			//}
+
+			/*TableView {
 				model: paramsModel
-				Layout.preferredWidth: 120 * 2 + 240
+				Layout.fillWidth: true
 				Layout.minimumHeight: 150
 				Layout.preferredHeight: 400
 				Layout.maximumHeight: 600
@@ -276,8 +411,7 @@ Window {
 
 				rowDelegate: rowDelegate
 				itemDelegate: editableDelegate
-			}
+			}*/
-		}
 		}
 
 		RowLayout
@@ -332,6 +466,7 @@ Window {
 
 				sourceComponent:
 				{
+					console.log("role " + styleData.role);
 					if (styleData.role === "value")
 					{
 						if (paramsModel.get(styleData.row) === undefined)
@@ -349,53 +484,7 @@ Window {
 						return editor;
 				}
 
-				Component
-				{
-					id: intViewComp
-					QIntTypeView
-					{
-						id: intView
-						text: styleData.value
-					}
-				}
-
-				Component
-				{
-					id: boolViewComp
-					QBoolTypeView
-					{
-						id: boolView
-						defaultValue: "1"
-						Component.onCompleted:
-						{
-							loaderEditor.updateValue(styleData.row, styleData.role,
-													 (paramsModel.get(styleData.row).value === "" ? defaultValue :
-																									paramsModel.get(styleData.row).value));
-							text = (paramsModel.get(styleData.row).value === "" ? defaultValue : paramsModel.get(styleData.row).value);
-						}
-					}
-				}
-
-				Component
-				{
-					id: stringViewComp
-					QStringTypeView
-					{
-						id: stringView
-						text: styleData.value
-					}
-				}
-
 
-				Component
-				{
-					id: hashViewComp
-					QHashTypeView
-					{
-						id: hashView
-						text: styleData.value
-					}
-				}
 
 				Component {
 					id: editor
@@ -404,12 +493,7 @@ Window {
 						readOnly: true
 						color: styleData.textColor
 						text: styleData.value
-						MouseArea {
+						font.family: regularFont.name
-							id: mouseArea
-							anchors.fill: parent
-							hoverEnabled: true
-							onClicked: textinput.forceActiveFocus()
-						}
 					}
 				}
 			}

mix/qml/qmldir

@@ -1 +1,2 @@
 singleton Style 1.0 Style.qml
+singleton StateDialogStyle 1.0 StateDialogStyle.qml

mix/res.qrc

@@ -83,5 +83,9 @@
         <file>qml/img/closedtriangleindicator_filesproject.png</file>
         <file>qml/img/opentriangleindicator_filesproject.png</file>
         <file>qml/img/projecticon.png</file>
+        <file>qml/SourceSansProRegular.qml</file>
+        <file>qml/SourceSansProBold.qml</file>
+        <file>qml/SourceSansProLight.qml</file>
+        <file>qml/StateDialogStyle.qml</file>
     </qresource>
 </RCC>