Merge pull request #1576 from arkpar/mix_ux

Mix bugfixes

mix/InverseMouseArea.cpp

@@ -39,11 +39,11 @@ bool InverseMouseArea::eventFilter(QObject* _obj, QEvent* _ev)
 {
 	Q_UNUSED(_obj);
 	if (this->m_active && _ev->type() == QEvent::MouseButtonPress && !this->contains(static_cast<QMouseEvent*>(_ev)->pos()))
-		emit clickedOutside();
+		emit clickedOutside(QPointF(static_cast<QMouseEvent*>(_ev)->pos()));
 	return false;
 }
 
-bool InverseMouseArea::contains(const QPoint& _point) const
+bool InverseMouseArea::contains(const QPointF& _point) const
 {
 	if (!this->m_active)
 		return false;

mix/InverseMouseArea.h

@@ -41,15 +41,15 @@ public:
 	void setActive(bool _v);
 
 protected:
-	void itemChange(ItemChange _c, const ItemChangeData& _v);
+	void itemChange(ItemChange _c, const ItemChangeData& _v) override;
-	bool eventFilter(QObject* _obj, QEvent *_ev);
+	bool eventFilter(QObject* _obj, QEvent *_ev) override;
-	bool contains(const QPoint& _point) const;
+	bool contains(const QPointF& _point) const override;
 
 private:
 	bool m_active;
 
 signals:
-	void clickedOutside();
+	void clickedOutside(QPointF _point);
 };
 
 }

mix/qml/Application.qml

@@ -29,6 +29,7 @@ ApplicationWindow {
 	property alias clientModel: clientModel;
 	property alias projectModel: projectModel;
 	property alias appService: appService;
+	property bool trackLastProject: true;
 
 	ApplicationService {
 		id: appService

mix/qml/CodeEditorView.qml

@@ -46,31 +46,36 @@ Item {
 		else
 		{
 			editorListModel.set(openDocCount, document);
-			editors.itemAt(openDocCount).visible = true;
+			doLoadDocument(editors.itemAt(openDocCount).item, editorListModel.get(openDocCount), false)
-			doLoadDocument(editors.itemAt(openDocCount).item, editorListModel.get(openDocCount))
+			loadComplete();
 		}
 		openDocCount++;
 	}
 
-	function doLoadDocument(editor, document) {
+	function doLoadDocument(editor, document, create) {
 		var data = fileIo.readFile(document.path);
+		if (create)
+		{
 			editor.onLoadComplete.connect(function() {
-			loadComplete();
+				codeEditorView.loadComplete();
 			});
 			editor.onEditorTextChanged.connect(function() {
-			documentEdit(document.documentId);
+				documentEdit(editor.document.documentId);
-			if (document.isContract)
+				if (editor.document.isContract)
-				codeModel.registerCodeChange(document.documentId, editor.getText());
+					codeModel.registerCodeChange(editor.document.documentId, editor.getText());
 			});
 			editor.onBreakpointsChanged.connect(function() {
-			if (document.isContract)
+				if (editor.document.isContract)
-				breakpointsChanged(document.documentId);
+					breakpointsChanged(editor.document.documentId);
 			});
-		editor.setText(data, document.syntaxMode);
 			editor.onIsCleanChanged.connect(function() {
-			isCleanChanged(editor.isClean, document.documentId);
+				isCleanChanged(editor.isClean, editor.document.documentId);
 			});
+		}
+		editor.document = document;
 		editor.sourceName = document.documentId;
+		editor.setText(data, document.syntaxMode);
+		editor.changeGeneration();
 	}
 
 	function getEditor(documentId) {
@@ -192,9 +197,6 @@ Item {
 		}
 
 		onProjectClosed: {
-			for (var i = 0; i < editorListModel.count; i++)
-				editors.itemAt(i).visible = false;
-			//editorListModel.clear();
 			currentDocumentId = "";
 			openDocCount = 0;
 		}
@@ -234,7 +236,7 @@ Item {
 		property variant item
 		property variant doc
 		onYes: {
-			doLoadDocument(item, doc);
+			doLoadDocument(item, doc, false);
 			resetEditStatus(doc.documentId);
 		}
 	}
@@ -251,7 +253,7 @@ Item {
 			asynchronous: true
 			anchors.fill:  parent
 			source: appService.haveWebEngine ? "WebCodeEditor.qml" : "CodeEditor.qml"
-			visible: (index >= 0 && index < editorListModel.count && currentDocumentId === editorListModel.get(index).documentId)
+			visible: (index >= 0 && index < openDocCount && currentDocumentId === editorListModel.get(index).documentId)
 			property bool changed: false
 			onVisibleChanged: {
 				loadIfNotLoaded()
@@ -271,7 +273,7 @@ Item {
 				loadIfNotLoaded()
 			}
 			onLoaded: {
-				doLoadDocument(loader.item, editorListModel.get(index))
+				doLoadDocument(loader.item, editorListModel.get(index), true)
 			}
 
 			Connections

mix/qml/ProjectModel.qml

@@ -76,7 +76,7 @@ Item {
 	Connections {
 		target: mainApplication
 		onLoaded: {
-			if (projectSettings.lastProjectPath && projectSettings.lastProjectPath !== "")
+			if (mainApplication.trackLastProject && projectSettings.lastProjectPath && projectSettings.lastProjectPath !== "")
 				projectModel.loadProject(projectSettings.lastProjectPath)
 		}
 	}

mix/qml/StatesComboBox.qml

@@ -99,11 +99,10 @@ Rectangle {
 		}
 
 		MouseArea {
+			id: selectorArea
 			anchors.fill: parent
 			onClicked: {
-				if (outsideClick.trigerred)
+				if (statesCombo.state === "")
-					outsideClick.trigerred = false;
-				else if (statesCombo.state === "")
 					statesCombo.state = "dropDown";
 			}
 		}
@@ -133,12 +132,12 @@ Rectangle {
 
 		InverseMouseArea
 		{
-			property bool trigerred: false
 			id: outsideClick
 			anchors.fill: parent
 			active: false
 			onClickedOutside: {
-				trigerred = true;
+				var p = selectorArea.mapFromItem(null, _point.x, _point.y);
+				if (!selectorArea.contains(Qt.point(p.x, p.y)))
 					statesCombo.hideDropDown()
 			}
 		}

mix/qml/WebCodeEditor.qml

@@ -18,6 +18,7 @@ Item {
 	property bool unloaded: false
 	property var currentBreakpoints: []
 	property string sourceName
+	property var document
 
 	function setText(text, mode) {
 		currentText = text;
@@ -117,6 +118,7 @@ Item {
 					codeModel.onCompilationError.connect(compilationError);
 				}
 				parent.changeGeneration();
+				loadComplete();
 			}
 		}
 

mix/qml/js/ProjectModel.js

@@ -124,6 +124,7 @@ function loadProject(path) {
 			for(var i = 0; i < projectData.files.length; i++) {
 				addFile(projectData.files[i]);
 			}
+			if (mainApplication.trackLastProject)
 				projectSettings.lastProjectPath = path;
 			projectLoading(projectData);
 			projectLoaded()

mix/test/qml/TestMain.qml

@@ -30,18 +30,20 @@ TestCase
 	Application
 	{
 		id: mainApplication
+		trackLastProject: false
 	}
 
 	function newProject()
 	{
-		waitForRendering(mainApplication.mainContent, 10000);
 		mainApplication.projectModel.createProject();
 		var projectDlg = mainApplication.projectModel.newProjectDialog;
 		wait(30);
 		projectDlg.projectTitle = "TestProject";
 		projectDlg.pathFieldText = "/tmp/MixTest"; //TODO: get platform temp path
 		projectDlg.acceptAndClose();
-		wait(30);
+		wait(1);
+		if (!ts.waitForSignal(mainApplication.codeModel, "compilationComplete()", 5000))
+			fail("new contract not compiled");
 	}
 
 	function editContract(c)
@@ -55,7 +57,7 @@ TestCase
 	function editHtml(c)
 	{
 		mainApplication.projectModel.openDocument("index.html");
-		wait(1);
+		ts.waitForSignal(mainApplication.mainContent.codeEditor, "loadComplete()", 5000);
 		mainApplication.mainContent.codeEditor.getEditor("index.html").setText(c);
 		ts.keyPressChar(mainApplication, "S", Qt.ControlModifier, 200); //Ctrl+S
 	}

mix/test/qml/js/TestDebugger.js

@@ -75,7 +75,6 @@ function test_constructorParameters()
 	ts.typeString("442", transactionDialog);
 	transactionDialog.acceptAndClose();
 	mainApplication.projectModel.stateDialog.model.addTransaction();
-	ts.waitForRendering(transactionDialog, 3000);
 	transactionDialog.selectFunction("getZ");
 	transactionDialog.acceptAndClose();
 	mainApplication.projectModel.stateDialog.acceptAndClose();