Merge remote-tracking branch 'up/develop' into registrar

cmake/EthCompilerSettings.cmake

@@ -3,7 +3,7 @@
 # C++11 check and activation
 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
 
-	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-unknown-pragmas -Wextra -DSHAREDLIB -fPIC")
+	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-unknown-pragmas -Wextra -Werror -DSHAREDLIB -fPIC")
 	set(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g -DETH_DEBUG")
 	set(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG -DETH_RELEASE")
 	set(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG -DETH_RELEASE")

libethereum/Executive.cpp

@@ -176,7 +176,7 @@ OnOpFunc Executive::simpleTrace()
 		o << endl << "    STACK" << endl;
 		for (auto i: vm.stack())
 			o << (h256)i << endl;
-		o << "    MEMORY" << endl << memDump(vm.memory());
+		o << "    MEMORY" << endl << (vm.memory().size() > 1000) ? " mem size greater than 1000 bytes " : memDump(vm.memory());
 		o << "    STORAGE" << endl;
 		for (auto const& i: ext.state().storage(ext.myAddress))
 			o << showbase << hex << i.first << ": " << i.second << endl;

mix/AppContext.cpp

@@ -73,6 +73,7 @@ void AppContext::load()
 	qmlRegisterType<QHashType>("org.ethereum.qml.QHashType", 1, 0, "QHashType");
 	qmlRegisterType<QBoolType>("org.ethereum.qml.QBoolType", 1, 0, "QBoolType");
 	qmlRegisterType<QVariableDeclaration>("org.ethereum.qml.QVariableDeclaration", 1, 0, "QVariableDeclaration");
+	qmlRegisterType<RecordLogEntry>("org.ethereum.qml.RecordLogEntry", 1, 0, "RecordLogEntry");
 	QQmlComponent projectModelComponent(m_applicationEngine, QUrl("qrc:/qml/ProjectModel.qml"));
 	QObject* projectModel = projectModelComponent.create();
 	if (projectModelComponent.isError())

mix/ClientModel.cpp

@@ -82,7 +82,7 @@ ClientModel::ClientModel(AppContext* _context):
 	qRegisterMetaType<QInstruction*>("QInstruction");
 	qRegisterMetaType<QCode*>("QCode");
 	qRegisterMetaType<QCallData*>("QCallData");
-	qRegisterMetaType<RecordLogEntry*>("RecordLogEntry");
+	qRegisterMetaType<RecordLogEntry*>("RecordLogEntry*");
 
 	connect(this, &ClientModel::runComplete, this, &ClientModel::showDebugger, Qt::QueuedConnection);
 	m_client.reset(new MixClient(QStandardPaths::writableLocation(QStandardPaths::TempLocation).toStdString()));
@@ -325,6 +325,11 @@ void ClientModel::showDebuggerForTransaction(ExecutionResult const& _t)
 	debugDataReady(debugData);
 }
 
+void ClientModel::emptyRecord()
+{
+	debugDataReady(new QDebugData());
+}
+
 
 void ClientModel::debugRecord(unsigned _index)
 {
@@ -349,6 +354,18 @@ void ClientModel::callContract(Address const& _contract, bytes const& _data, Tra
 	m_client->transact(m_client->userAccount().secret(), _tr.value, _contract, _data, _tr.gas, _tr.gasPrice);
 }
 
+RecordLogEntry* ClientModel::lastBlock() const
+{
+	eth::BlockInfo blockInfo = m_client->blockInfo();
+	std::stringstream strGas;
+	strGas << blockInfo.gasUsed;
+	std::stringstream strNumber;
+	strNumber << blockInfo.number;
+	RecordLogEntry* record =  new RecordLogEntry(0, QString::fromStdString(strNumber.str()), tr(" - Block - "), tr("Hash: ") + QString(QString::fromStdString(toHex(blockInfo.hash.ref()))), tr("Gas Used: ") + QString::fromStdString(strGas.str()), QString(), QString(), false, RecordLogEntry::RecordType::Block);
+	QQmlEngine::setObjectOwnership(record, QQmlEngine::JavaScriptOwnership);
+	return record;
+}
+
 void ClientModel::onStateReset()
 {
 	m_contractAddresses.clear();
@@ -424,7 +441,7 @@ void ClientModel::onNewTransaction()
 		}
 	}
 
-	RecordLogEntry* log = new RecordLogEntry(recordIndex, transactionIndex, contract, function, value, address, returned, tr.isCall());
+	RecordLogEntry* log = new RecordLogEntry(recordIndex, transactionIndex, contract, function, value, address, returned, tr.isCall(), RecordLogEntry::RecordType::Transaction);
 	QQmlEngine::setObjectOwnership(log, QQmlEngine::JavaScriptOwnership);
 	emit newRecord(log);
 }

mix/ClientModel.h

@@ -72,6 +72,7 @@ struct TransactionSettings
 class RecordLogEntry: public QObject
 {
 	Q_OBJECT
+	Q_ENUMS(RecordType)
 	/// Recording index
 	Q_PROPERTY(unsigned recordIndex MEMBER m_recordIndex CONSTANT)
 	/// Human readable transaction bloack and transaction index
@@ -88,13 +89,20 @@ class RecordLogEntry: public QObject
 	Q_PROPERTY(QString returned MEMBER m_returned CONSTANT)
 	/// true if call, false if transaction
 	Q_PROPERTY(bool call MEMBER m_call CONSTANT)
-
+	/// @returns record type
+	Q_PROPERTY(RecordType type MEMBER m_type CONSTANT)
 
 public:
+	enum RecordType
+	{
+		Transaction,
+		Block
+	};
+
 	RecordLogEntry():
-		m_recordIndex(0), m_call(false) {}
-	RecordLogEntry(unsigned _recordIndex, QString _transactionIndex, QString _contract, QString _function, QString _value, QString _address, QString _returned, bool _call):
-		m_recordIndex(_recordIndex), m_transactionIndex(_transactionIndex), m_contract(_contract), m_function(_function), m_value(_value), m_address(_address), m_returned(_returned), m_call(_call) {}
+		m_recordIndex(0), m_call(false), m_type(RecordType::Transaction) {}
+	RecordLogEntry(unsigned _recordIndex, QString _transactionIndex, QString _contract, QString _function, QString _value, QString _address, QString _returned, bool _call, RecordType _type):
+		m_recordIndex(_recordIndex), m_transactionIndex(_transactionIndex), m_contract(_contract), m_function(_function), m_value(_value), m_address(_address), m_returned(_returned), m_call(_call), m_type(_type) {}
 
 private:
 	unsigned m_recordIndex;
@@ -105,6 +113,7 @@ private:
 	QString m_address;
 	QString m_returned;
 	bool m_call;
+	RecordType m_type;
 };
 
 /**
@@ -123,11 +132,12 @@ public:
 	Q_PROPERTY(bool mining MEMBER m_mining NOTIFY miningStateChanged)
 	/// @returns deployed contracts addresses
 	Q_PROPERTY(QVariantMap contractAddresses READ contractAddresses NOTIFY contractAddressesChanged)
+	// @returns the last block
+	Q_PROPERTY(RecordLogEntry* lastBlock READ lastBlock CONSTANT)
 	/// ethereum.js RPC request entry point
 	/// @param _message RPC request in Json format
 	/// @returns RPC response in Json format
 	Q_INVOKABLE QString apiCall(QString const& _message);
-
 	/// Simulate mining. Creates a new block
 	Q_INVOKABLE void mine();
 
@@ -139,6 +149,8 @@ public slots:
 	void setupState(QVariantMap _state);
 	/// Show the debugger for a specified record
 	Q_INVOKABLE void debugRecord(unsigned _index);
+	/// Show the debugger for an empty record
+	Q_INVOKABLE void emptyRecord();
 
 private slots:
 	/// Update UI with machine states result. Display a modal dialog.
@@ -177,6 +189,7 @@ signals:
 	void stateCleared();
 
 private:
+	RecordLogEntry* lastBlock() const;
 	QVariantMap contractAddresses() const;
 	void executeSequence(std::vector<TransactionSettings> const& _sequence, u256 _balance);
 	dev::Address deployContract(bytes const& _code, TransactionSettings const& _tr = TransactionSettings());
@@ -199,3 +212,5 @@ private:
 
 }
 }
+
+Q_DECLARE_METATYPE(dev::mix::RecordLogEntry*)

mix/MixClient.cpp

@@ -436,6 +436,12 @@ h256 MixClient::hashFromNumber(unsigned _number) const
 eth::BlockInfo MixClient::blockInfo(h256 _hash) const
 {
 	return BlockInfo(bc().block(_hash));
+
+}
+
+eth::BlockInfo MixClient::blockInfo() const
+{
+	return BlockInfo(bc().block());
 }
 
 eth::BlockDetails MixClient::blockDetails(h256 _hash) const

mix/MixClient.h

@@ -89,6 +89,8 @@ public:
 	eth::MineProgress miningProgress() const override;
 	std::pair<h256, u256> getWork() override { return std::pair<h256, u256>(); }
 	bool submitNonce(h256 const&) override { return false; }
+	/// @returns the last mined block information
+	eth::BlockInfo blockInfo() const;
 
 private:
 	void executeTransaction(dev::eth::Transaction const& _t, eth::State& _state, bool _call);

mix/qml/Debugger.qml

@@ -12,7 +12,7 @@ Rectangle {
 	id: debugPanel
 
 	property alias transactionLog : transactionLog
-
+	property string compilationErrorMessage
 	objectName: "debugPanel"
 	color: "#ededed"
 	clip: true
@@ -23,25 +23,30 @@ Rectangle {
 			forceActiveFocus();
 	}
 
+	function displayCompilationErrorIfAny()
+	{
+		debugScrollArea.visible = false;
+		compilationErrorArea.visible = true;
+		machineStates.visible = false;
+		var errorInfo = ErrorLocationFormater.extractErrorInfo(compilationErrorMessage, false);
+		errorLocation.text = errorInfo.errorLocation;
+		errorDetail.text = errorInfo.errorDetail;
+		errorLine.text = errorInfo.errorLine;
+	}
+
 	function update(data, giveFocus)
 	{
-		if (statusPane && codeModel.hasContract)
+		if (data === null)
+			Debugger.init(null);
+		else if (data.states.length === 0)
+			Debugger.init(null);
+		else if (codeModel.hasContract)
 		{
 			Debugger.init(data);
 			debugScrollArea.visible = true;
 			compilationErrorArea.visible = false;
 			machineStates.visible = true;
 		}
-		else
-		{
-			debugScrollArea.visible = false;
-			compilationErrorArea.visible = true;
-			machineStates.visible = false;
-			var errorInfo = ErrorLocationFormater.extractErrorInfo(statusPane.result.compilerMessage, false);
-			errorLocation.text = errorInfo.errorLocation;
-			errorDetail.text = errorInfo.errorDetail;
-			errorLine.text = errorInfo.errorLine;
-		}
 		if (giveFocus)
 			forceActiveFocus();
 	}
@@ -55,7 +60,15 @@ Rectangle {
 
 	Connections {
 		target: codeModel
-		onCompilationComplete: update(null, false);
+		onCompilationComplete:
+		{
+			debugPanel.compilationErrorMessage = "";
+			update(null, false);
+		}
+
+		onCompilationError: {
+			debugPanel.compilationErrorMessage = _error;
+		}
 	}
 
 	Settings {
@@ -73,7 +86,7 @@ Rectangle {
 		visible: false;
 		id: compilationErrorArea
 		width: parent.width - 20
-		height: 500
+		height: 600
 		color: "#ededed"
 		anchors.left: parent.left
 		anchors.top: parent.top
@@ -82,7 +95,20 @@ Rectangle {
 		{
 			width: parent.width
 			anchors.top: parent.top
-			spacing: 25
+			spacing: 15
+			Rectangle
+			{
+				height: 15
+				Button {
+					text: qsTr("Back to Debugger")
+					onClicked: {
+						debugScrollArea.visible = true;
+						compilationErrorArea.visible = false;
+						machineStates.visible = true;
+					}
+				}
+			}
+
 			RowLayout
 			{
 				height: 100

mix/qml/FilesSection.qml

@@ -6,17 +6,19 @@ import QtQuick.Controls.Styles 1.3
 import "."
 
 
-ColumnLayout {
+Rectangle
+{
+	Layout.fillWidth: true
+	Layout.minimumHeight: hiddenHeightTopLevel()
+	height: hiddenHeightTopLevel()
+	Layout.maximumHeight: hiddenHeightTopLevel()
 	id: wrapperItem
 	signal documentSelected(string doc, string groupName)
 	property alias model: filesList.model
 	property string sectionName;
 	property variant selManager;
-	Layout.fillWidth: true
-	Layout.minimumHeight: hiddenHeightTopLevel()
-	height: hiddenHeightTopLevel()
-	Layout.maximumHeight: hiddenHeightTopLevel()
-	spacing: 0
+	property int index;
+	color: index % 2 === 0 ? "transparent" : ProjectFilesStyle.title.background
 
 	function hiddenHeightTopLevel()
 	{
@@ -48,196 +50,203 @@ ColumnLayout {
 			model.remove(i);
 	}
 
-	SourceSansProRegular
-	{
-		id: fileNameFont
-	}
-
-	SourceSansProBold
-	{
-		id: boldFont
-	}
+	ColumnLayout {
+		anchors.fill: parent
+		spacing: 0
 
-	RowLayout
-	{
-		anchors.top: parent.top
-		id: rowCol
-		width: parent.width
-		height: ProjectFilesStyle.documentsList.height
-
-		Image {
-			source: "qrc:/qml/img/opentriangleindicator_filesproject.png"
-			width: 15
-			sourceSize.width: 12
-			id: imgArrow
-			anchors.right: section.left
-			anchors.rightMargin: 8
-			anchors.top: parent.top
-			anchors.topMargin: 6
+		SourceSansProRegular
+		{
+			id: fileNameFont
 		}
 
-		Text
+		SourceSansProBold
 		{
-			id: section
-			text: sectionName
-			anchors.left: parent.left
-			anchors.leftMargin: ProjectFilesStyle.general.leftMargin
-			color: ProjectFilesStyle.documentsList.sectionColor
-			font.family: boldFont.name
-			font.pointSize: ProjectFilesStyle.documentsList.sectionFontSize
-			states: [
-				State {
-					name: "hidden"
-					PropertyChanges { target: filesList; visible: false; }
-					PropertyChanges { target: rowCol; Layout.minimumHeight: ProjectFilesStyle.documentsList.height; Layout.maximumHeight: ProjectFilesStyle.documentsList.height; height: ProjectFilesStyle.documentsList.height; }
-					PropertyChanges { target: imgArrow; source: "qrc:/qml/img/closedtriangleindicator_filesproject.png" }
-				}
-			]
+			id: boldFont
 		}
 
-		MouseArea {
-			id: titleMouseArea
-			anchors.fill: parent
-			hoverEnabled: true
-			z: 2
-			onClicked: {
-				if (section.state === "hidden")
-					section.state = "";
-				else
-					section.state = "hidden";
+		RowLayout
+		{
+			anchors.top: parent.top
+			id: rowCol
+			height: ProjectFilesStyle.documentsList.height
+			Layout.fillWidth: true
+
+
+			Image {
+				source: "qrc:/qml/img/opentriangleindicator_filesproject.png"
+				width: 15
+				sourceSize.width: 12
+				id: imgArrow
+				anchors.right: section.left
+				anchors.rightMargin: 8
+				anchors.top: parent.top
+				anchors.topMargin: 10
+			}
+
+			Text
+			{
+				id: section
+				text: sectionName
+				anchors.left: parent.left
+				anchors.leftMargin: ProjectFilesStyle.general.leftMargin
+				color: ProjectFilesStyle.documentsList.sectionColor
+				font.family: boldFont.name
+				font.pointSize: ProjectFilesStyle.documentsList.sectionFontSize
+				states: [
+					State {
+						name: "hidden"
+						PropertyChanges { target: filesList; visible: false; }
+						PropertyChanges { target: rowCol; Layout.minimumHeight: ProjectFilesStyle.documentsList.height; Layout.maximumHeight: ProjectFilesStyle.documentsList.height; height: ProjectFilesStyle.documentsList.height; }
+						PropertyChanges { target: imgArrow; source: "qrc:/qml/img/closedtriangleindicator_filesproject.png" }
+					}
+				]
+			}
+
+			MouseArea {
+				id: titleMouseArea
+				anchors.fill: parent
+				hoverEnabled: true
+				z: 2
+				onClicked: {
+					if (section.state === "hidden")
+						section.state = "";
+					else
+						section.state = "hidden";
+				}
 			}
 		}
-	}
 
-	ColumnLayout {
-		height: wrapperItem.hiddenHeightRepeater()
-		Layout.minimumHeight: wrapperItem.hiddenHeightRepeater()
-		Layout.preferredHeight: wrapperItem.hiddenHeightRepeater()
-		Layout.maximumHeight: wrapperItem.hiddenHeightRepeater()
-		width: parent.width
-		visible: section.state !== "hidden"
-		spacing: 0
-		Repeater
-		{
-			id: filesList
+		ColumnLayout {
+			height: wrapperItem.hiddenHeightRepeater()
+			Layout.minimumHeight: wrapperItem.hiddenHeightRepeater()
+			Layout.preferredHeight: wrapperItem.hiddenHeightRepeater()
+			Layout.maximumHeight: wrapperItem.hiddenHeightRepeater()
+			width: parent.width
 			visible: section.state !== "hidden"
-			Rectangle
+			spacing: 0
+
+			Repeater
 			{
+				id: filesList
 				visible: section.state !== "hidden"
-				id: rootItem
-				Layout.fillWidth: true
-				Layout.minimumHeight: wrapperItem.hiddenHeightElement()
-				Layout.preferredHeight: wrapperItem.hiddenHeightElement()
-				Layout.maximumHeight: wrapperItem.hiddenHeightElement()
-				height: wrapperItem.hiddenHeightElement()
-				color: isSelected ? ProjectFilesStyle.documentsList.highlightColor : ProjectFilesStyle.documentsList.background
-				property bool isSelected
-				property bool renameMode
-				Text {
-					id: nameText
-					height: parent.height
-					visible: !renameMode
-					color: rootItem.isSelected ? ProjectFilesStyle.documentsList.selectedColor : ProjectFilesStyle.documentsList.color
-					text: name;
-					font.family: fileNameFont.name
-					font.pointSize: ProjectFilesStyle.documentsList.fontSize
-					anchors.verticalCenter: parent.verticalCenter
-					verticalAlignment:  Text.AlignVCenter
-					anchors.left: parent.left
-					anchors.leftMargin: ProjectFilesStyle.general.leftMargin + 2
-					width: parent.width
-					Connections
-					{
-						target: selManager
-						onSelected: {
-							if (groupName != sectionName)
-								rootItem.isSelected = false;
-							else if (doc === documentId)
-								rootItem.isSelected = true;
-							else
-								rootItem.isSelected = false;
+				Rectangle
+				{
+					visible: section.state !== "hidden"
+					id: rootItem
+					Layout.fillWidth: true
+					Layout.minimumHeight: wrapperItem.hiddenHeightElement()
+					Layout.preferredHeight: wrapperItem.hiddenHeightElement()
+					Layout.maximumHeight: wrapperItem.hiddenHeightElement()
+					height: wrapperItem.hiddenHeightElement()
+					color: isSelected ? ProjectFilesStyle.documentsList.highlightColor : "transparent"
+					property bool isSelected
+					property bool renameMode
+					Text {
+						id: nameText
+						height: parent.height
+						visible: !renameMode
+						color: rootItem.isSelected ? ProjectFilesStyle.documentsList.selectedColor : ProjectFilesStyle.documentsList.color
+						text: name;
+						font.family: fileNameFont.name
+						font.pointSize: ProjectFilesStyle.documentsList.fontSize
+						anchors.verticalCenter: parent.verticalCenter
+						verticalAlignment:  Text.AlignVCenter
+						anchors.left: parent.left
+						anchors.leftMargin: ProjectFilesStyle.general.leftMargin + 2
+						width: parent.width
+						Connections
+						{
+							target: selManager
+							onSelected: {
+								if (groupName != sectionName)
+									rootItem.isSelected = false;
+								else if (doc === documentId)
+									rootItem.isSelected = true;
+								else
+									rootItem.isSelected = false;
 
-							if (rootItem.isSelected && section.state === "hidden")
-								section.state = "";
+								if (rootItem.isSelected && section.state === "hidden")
+									section.state = "";
+							}
 						}
 					}
-				}
 
-				TextInput {
-					id: textInput
-					text: nameText.text
-					visible: renameMode
-					anchors.verticalCenter: parent.verticalCenter
-					anchors.left: parent.left
-					anchors.leftMargin: ProjectFilesStyle.general.leftMargin
-					MouseArea {
-						id: textMouseArea
-						anchors.fill: parent
-						hoverEnabled: true
-						z: 2
-						onClicked: {
-							textInput.forceActiveFocus();
+					TextInput {
+						id: textInput
+						text: nameText.text
+						visible: renameMode
+						anchors.verticalCenter: parent.verticalCenter
+						anchors.left: parent.left
+						anchors.leftMargin: ProjectFilesStyle.general.leftMargin
+						MouseArea {
+							id: textMouseArea
+							anchors.fill: parent
+							hoverEnabled: true
+							z: 2
+							onClicked: {
+								textInput.forceActiveFocus();
+							}
 						}
-					}
 
-					onVisibleChanged: {
-						if (visible) {
-							selectAll();
-							forceActiveFocus();
+						onVisibleChanged: {
+							if (visible) {
+								selectAll();
+								forceActiveFocus();
+							}
 						}
-					}
 
-					onAccepted: close(true);
-					onCursorVisibleChanged: {
-						if (!cursorVisible)
-							close(false);
-					}
-					onFocusChanged: {
-						if (!focus)
-							close(false);
-					}
-					function close(accept) {
-						rootItem.renameMode = false;
-						if (accept)
-						{
-							var i = getDocumentIndex(documentId);
-							projectModel.renameDocument(documentId, textInput.text);
-							wrapperItem.model.set(i, projectModel.getDocument(documentId));
+						onAccepted: close(true);
+						onCursorVisibleChanged: {
+							if (!cursorVisible)
+								close(false);
+						}
+						onFocusChanged: {
+							if (!focus)
+								close(false);
+						}
+						function close(accept) {
+							rootItem.renameMode = false;
+							if (accept)
+							{
+								var i = getDocumentIndex(documentId);
+								projectModel.renameDocument(documentId, textInput.text);
+								wrapperItem.model.set(i, projectModel.getDocument(documentId));
+							}
 						}
 					}
-				}
 
-				MouseArea {
-					id: mouseArea
-					z: 1
-					hoverEnabled: false
-					anchors.fill: parent
-					acceptedButtons: Qt.LeftButton | Qt.RightButton
-					onClicked:{
-						if (mouse.button === Qt.RightButton && !isContract)
-							contextMenu.popup();
-						else if (mouse.button === Qt.LeftButton)
-						{
-							rootItem.isSelected = true;
-							projectModel.openDocument(documentId);
-							documentSelected(documentId, groupName);
+					MouseArea {
+						id: mouseArea
+						z: 1
+						hoverEnabled: false
+						anchors.fill: parent
+						acceptedButtons: Qt.LeftButton | Qt.RightButton
+						onClicked:{
+							if (mouse.button === Qt.RightButton && !isContract)
+								contextMenu.popup();
+							else if (mouse.button === Qt.LeftButton)
+							{
+								rootItem.isSelected = true;
+								projectModel.openDocument(documentId);
+								documentSelected(documentId, groupName);
+							}
 						}
 					}
-				}
 
-				Menu {
-					id: contextMenu
-					MenuItem {
-						text: qsTr("Rename")
-						onTriggered: {
-							rootItem.renameMode = true;
+					Menu {
+						id: contextMenu
+						MenuItem {
+							text: qsTr("Rename")
+							onTriggered: {
+								rootItem.renameMode = true;
+							}
 						}
-					}
-					MenuItem {
-						text: qsTr("Delete")
-						onTriggered: {
-							projectModel.removeDocument(documentId);
-							wrapperItem.removeDocument(documentId);
+						MenuItem {
+							text: qsTr("Delete")
+							onTriggered: {
+								projectModel.removeDocument(documentId);
+								wrapperItem.removeDocument(documentId);
+							}
 						}
 					}
 				}
@@ -245,4 +254,3 @@ ColumnLayout {
 		}
 	}
 }
-

mix/qml/MainContent.qml

@@ -75,6 +75,12 @@ Rectangle {
 		codeWebSplitter.orientation = (codeWebSplitter.orientation === Qt.Vertical ? Qt.Horizontal : Qt.Vertical);
 	}
 
+	function displayCompilationErrorIfAny()
+	{
+		rightView.visible = true;
+		rightView.displayCompilationErrorIfAny();
+	}
+
 	CodeEditorExtensionManager {
 		headerView: headerPaneTabs;
 	}

mix/qml/ProjectFilesStyle.qml

@@ -25,7 +25,7 @@ QtObject {
 		property string sectionColor: "#808080"
 		property string selectedColor: "white"
 		property string highlightColor: "#4a90e2"
-		property int height: 25
+		property int height: 35
 		property int fileNameHeight: 30
 		property int fontSize: absoluteSize(2)// 13
 		property int sectionFontSize: absoluteSize(2)// 13

mix/qml/ProjectList.qml

@@ -26,11 +26,9 @@ Item {
 			Image {
 				id: projectIcon
 				source: "qrc:/qml/img/dappProjectIcon.png"
-				//sourceSize.height: 32
 				anchors.right: projectTitle.left
 				anchors.verticalCenter: parent.verticalCenter
 				anchors.rightMargin: 6
-				//anchors.centerIn: parent
 				fillMode: Image.PreserveAspectFit
 				width: 32
 				height: 32
@@ -65,7 +63,7 @@ Item {
 		Rectangle
 		{
 			Layout.fillWidth: true
-			height: 10
+			height: 3
 			color: ProjectFilesStyle.documentsList.background
 		}
 
@@ -82,14 +80,24 @@ Item {
 				anchors.top: parent.top
 				width: parent.width
 				spacing: 0
-
 				Repeater {
 					model: [qsTr("Contracts"), qsTr("Javascript"), qsTr("Web Pages"), qsTr("Styles"), qsTr("Images"), qsTr("Misc")];
 					signal selected(string doc, string groupName)
+					property int incr: -1;
 					id: sectionRepeater
 					FilesSection
 					{
+						id: section;
 						sectionName: modelData
+						index:
+						{
+							for (var k in sectionRepeater.model)
+							{
+								if (sectionRepeater.model[k] === modelData)
+									return k;
+							}
+						}
+
 						model: sectionModel
 						selManager: sectionRepeater
 
@@ -119,7 +127,7 @@ Item {
 											ci++;
 										}
 									}
-								}	
+								}
 							}
 						}
 
@@ -170,10 +178,10 @@ Item {
 									projectModel.openDocument(newDoc.documentId);
 									sectionRepeater.selected(newDoc.documentId, modelData);
 								}
-
 							}
 						}
 					}
+
 				}
 			}
 		}

mix/qml/StatusPane.qml

@@ -1,6 +1,7 @@
 import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
+import QtQuick.Controls.Styles 1.3
 import "js/ErrorLocationFormater.js" as ErrorLocationFormater
 import "."
 
@@ -13,7 +14,7 @@ Rectangle {
 		if (!message)
 		{
 			status.state = "";
-			status.text = qsTr("Compile without errors.");
+			status.text = qsTr("Compile successfully.");
 			logslink.visible = false;
 			debugImg.state = "active";
 		}
@@ -64,6 +65,7 @@ Rectangle {
 
 	color: "transparent"
 	anchors.fill: parent
+
 	Rectangle {
 		id: statusContainer
 		anchors.horizontalCenter: parent.horizontalCenter
@@ -72,49 +74,87 @@ Rectangle {
 		width: 500
 		height: 30
 		color: "#fcfbfc"
-		RowLayout {
+
+
+		Text {
+			anchors.verticalCenter: parent.verticalCenter
 			anchors.horizontalCenter: parent.horizontalCenter
+			font.pointSize: StatusPaneStyle.general.statusFontSize
+			height: 15
+			font.family: "sans serif"
+			objectName: "status"
+			wrapMode: Text.WrapAnywhere
+			elide: Text.ElideRight
+			maximumLineCount: 1
+			clip: true
+			id: status
+			states: [
+				State {
+					name: "error"
+					PropertyChanges {
+						target: status
+						color: "red"
+					}
+					PropertyChanges {
+						target: statusContainer
+						color: "#fffcd5"
+					}
+				}
+			]
+			onTextChanged:
+			{
+				updateWidth()
+				toolTipInfo.tooltip = text;
+			}
+
+			function updateWidth()
+			{
+				if (text.length > 80)
+					width = parent.width - 10
+				else
+					width = undefined
+			}
+		}
+
+		Button
+		{
 			anchors.verticalCenter: parent.verticalCenter
-			spacing: 5
+			anchors.left: parent.right
+			anchors.leftMargin: 10
+			width: 38
+			height: 28
+			visible: false
+			text: qsTr("Log")
+			objectName: "status"
+			id: logslink
+			action: displayLogAction
+		}
 
-			Text {
-				font.pointSize: StatusPaneStyle.general.statusFontSize
-				height: 9
-				font.family: "sans serif"
-				objectName: "status"
-				id: status
-				states:[
-					State {
-						name: "error"
-						PropertyChanges {
-							target: status
-							color: "red"
-						}
-						PropertyChanges {
-							target: statusContainer
-							color: "#fffcd5"
-						}
-					}
-				]
+		Action {
+			id: displayLogAction
+			onTriggered: {
+				mainContent.displayCompilationErrorIfAny();
 			}
+		}
 
-			Text {
-				visible: false
-				font.pointSize: StatusPaneStyle.general.logLinkFontSize
-				height: 9
-				text: qsTr("See Log.")
-				font.family: "Monospace"
-				objectName: "status"
-				id: logslink
-				color: "#8c8a74"
-				MouseArea {
-					anchors.fill: parent
-					onClicked: {
-						mainContent.ensureRightView();
-					}
+		Button
+		{
+			anchors.fill: parent
+			id: toolTip
+			action: toolTipInfo
+			text: ""
+			style:
+				ButtonStyle {
+				background:Rectangle {
+					color: "transparent"
 				}
 			}
 		}
+
+		Action {
+			id: toolTipInfo
+			tooltip: ""
+		}
 	}
 
 	Rectangle

mix/qml/TransactionLog.qml

@@ -3,15 +3,13 @@ import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.1
 import QtQuick.Dialogs 1.1
 import QtQuick.Layouts 1.1
+import org.ethereum.qml.RecordLogEntry 1.0
 
 Item {
 
-	property bool showLogs: true
 	property ListModel fullModel: ListModel{}
 	property ListModel transactionModel: ListModel{}
-	onShowLogsChanged: {
-		logTable.model = showLogs ? fullModel : transactionModel
-	}
+	property ListModel callModel: ListModel{}
 
 	Action {
 		id: addStateAction
@@ -78,13 +76,24 @@ Item {
 				action: mineAction
 			}
 
-			CheckBox {
-				id: recording
-				text: qsTr("Record transactions");
-				checked: true
-				Layout.fillWidth: true
+			ComboBox {
+				id: itemFilter
+
+				function getCurrentModel()
+				{
+					return currentIndex === 0 ? fullModel : currentIndex === 1 ? transactionModel : currentIndex === 2 ? callModel : fullModel;
+				}
 
+				model: ListModel {
+					ListElement { text: qsTr("Calls and Transactions"); value: 0;  }
+					ListElement { text: qsTr("Only Transactions"); value: 1;  }
+					ListElement { text: qsTr("Only Calls"); value: 2;  }
+				}
 
+				onCurrentIndexChanged:
+				{
+					logTable.model = itemFilter.getCurrentModel();
+				}
 			}
 		}
 		TableView {
@@ -125,7 +134,10 @@ Item {
 			}
 			onActivated:  {
 				var item = logTable.model.get(row);
-				clientModel.debugRecord(item.recordIndex);
+				if (item.type === RecordLogEntry.Transaction)
+					clientModel.debugRecord(item.recordIndex);
+				else
+					clientModel.emptyRecord();
 			}
 			Keys.onPressed: {
 				if ((event.modifiers & Qt.ControlModifier) && event.key === Qt.Key_C && currentRow >=0 && currentRow < logTable.model.count) {
@@ -141,15 +153,18 @@ Item {
 		onStateCleared: {
 			fullModel.clear();
 			transactionModel.clear();
+			callModel.clear();
 		}
 		onNewRecord: {
-			if (recording.checked)
-			{
-				fullModel.append(_r);
-				if (!_r.call)
-					transactionModel.append(_r);
-			}
+			fullModel.append(_r);
+			if (!_r.call)
+				transactionModel.append(_r);
+			else
+				callModel.append(_r);
+		}
+		onMiningComplete: {
+			fullModel.append(clientModel.lastBlock);
+			transactionModel.append(clientModel.lastBlock);
 		}
 	}
-
 }

mix/qml/WebPreview.qml

@@ -26,7 +26,8 @@ Item {
 	function reload() {
 		if (initialized) {
 			updateContract();
-			webView.runJavaScript("reloadPage()");
+			//webView.runJavaScript("reloadPage()");
+			setPreviewUrl(urlInput.text);
 		}
 	}
 
@@ -55,11 +56,13 @@ Item {
 	}
 
 	function changePage() {
-		if (pageCombo.currentIndex >= 0 && pageCombo.currentIndex < pageListModel.count) {
+		setPreviewUrl(urlInput.text);
+		/*if (pageCombo.currentIndex >= 0 && pageCombo.currentIndex < pageListModel.count) {
+			urlInput.text = httpServer.url + "/" + pageListModel.get(pageCombo.currentIndex).documentId;
 			setPreviewUrl(httpServer.url + "/" + pageListModel.get(pageCombo.currentIndex).documentId);
 		} else {
 			setPreviewUrl("");
-		}
+		}*/
 	}
 	Connections {
 		target: appContext
@@ -98,24 +101,16 @@ Item {
 			updateDocument(documentId, function(i) { pageListModel.set(i, projectModel.getDocument(documentId)) } )
 		}
 
-		onDocumentOpened: {
-			if (!document.isHtml)
-				return;
-			for (var i = 0; i < pageListModel.count; i++) {
-				var doc = pageListModel.get(i);
-				if (doc.documentId === document.documentId) {
-					pageCombo.currentIndex = i;
-				}
-			}
-		}
-
 		onProjectLoading: {
 			for (var i = 0; i < target.listModel.count; i++) {
 				var document = target.listModel.get(i);
 				if (document.isHtml) {
 					pageListModel.append(document);
 					if (pageListModel.count === 1) //first page added
-						changePage();
+					{
+						urlInput.text = httpServer.url + "/" + document.documentId;
+						setPreviewUrl(httpServer.url + "/" + document.documentId);
+					}
 				}
 			}
 		}
@@ -151,13 +146,20 @@ Item {
 			else
 			{
 				//document request
+				if (urlPath === "/")
+					urlPath = "/index.html";
 				var documentId = urlPath.substr(urlPath.lastIndexOf("/") + 1);
 				var content = "";
 				if (projectModel.codeEditor.isDocumentOpen(documentId))
 					content = projectModel.codeEditor.getDocumentText(documentId);
 				else
-					content = fileIo.readFile(projectModel.getDocument(documentId).path);
-				if (documentId === pageListModel.get(pageCombo.currentIndex).documentId) {
+				{
+					var doc = projectModel.getDocument(documentId);
+					if (doc !== undefined)
+						content = fileIo.readFile(doc.path);
+				}
+
+				if (documentId === urlInput.text.replace(httpServer.url + "/", "")) {
 					//root page, inject deployment script
 					content = "<script>web3=parent.web3;contracts=parent.contracts;</script>\n" + content;
 					_request.setResponseContentType("text/html");
@@ -181,19 +183,23 @@ Item {
 				anchors.fill: parent
 				anchors.leftMargin: 3
 				spacing: 3
-				DefaultLabel {
-					text: qsTr("Preview of")
-					anchors.verticalCenter: parent.verticalCenter
-				}
 
-				ComboBox {
-					id: pageCombo
-					model: pageListModel
-					textRole: "name"
-					currentIndex: -1
-					onCurrentIndexChanged: changePage()
+				DefaultTextField
+				{
+					id: urlInput
 					anchors.verticalCenter: parent.verticalCenter
 					height: 21
+					width: 300
+					Keys.onEnterPressed:
+					{
+						setPreviewUrl(text);
+					}
+					Keys.onReturnPressed:
+					{
+						setPreviewUrl(text);
+					}
+
+					focus: true
 				}
 
 				Action {

mix/qml/main.qml

@@ -56,7 +56,7 @@ ApplicationWindow {
 			MenuItem { action: toggleTransactionLogAction }
 			MenuItem { action: toggleWebPreviewAction }
 			MenuItem { action: toggleWebPreviewOrientationAction }
-			MenuItem { action: toggleCallsInLog }
+			//MenuItem { action: toggleCallsInLog }
 		}
 	}
 
@@ -92,7 +92,7 @@ ApplicationWindow {
 
 	Action {
 		id: mineAction
-		text: qsTr("Mine")
+		text: qsTr("New Block")
 		shortcut: "Ctrl+M"
 		onTriggered: clientModel.mine();
 		enabled: codeModel.hasContract && !clientModel.running && !clientModel.mining
@@ -165,15 +165,6 @@ ApplicationWindow {
 		onTriggered: mainContent.toggleWebPreviewOrientation();
 	}
 
-	Action {
-		id: toggleCallsInLog
-		text: qsTr("Show Calls in Transaction Log")
-		shortcut: ""
-		checkable: true
-		checked: mainContent.rightPane.transactionLog.showLogs
-		onTriggered: mainContent.rightPane.transactionLog.showLogs = !mainContent.rightPane.transactionLog.showLogs
-	}
-
 	Action {
 		id: toggleRunOnLoadAction
 		text: qsTr("Load State on Startup")