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

qml.qrc

@@ -85,5 +85,8 @@
         <file>qml/js/ScientificNumber.js</file>
         <file>qml/NewFolderDialog.qml</file>
         <file>qml/TooltipArea.qml</file>
+        <file>qml/WelcomeView.qml</file>
+        <file>qml/DefaultCompleteButton.qml</file>
+        <file>qml/WelcomeViewStyle.qml</file>
     </qresource>
 </RCC>

qml/AlertMessageDialog.qml

@@ -1,3 +1,23 @@
+/*
+	This file is part of cpp-ethereum.
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file AlertMessageDialog.qml
+ * @author Yann [email protected]
+ * @author Arkadiy Paronyan [email protected]
+ * @date 2015
+ * Ethereum IDE client.
+ */
+
 import QtQuick 2.2
 import QtQuick.Window 2.0
 

qml/Application.qml

@@ -1,3 +1,23 @@
+/*
+	This file is part of cpp-ethereum.
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file Application.qml
+ * @author Yann [email protected]
+ * @author Arkadiy Paronyan [email protected]
+ * @date 2015
+ * Ethereum IDE client.
+ */
+
 import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.1
@@ -31,6 +51,7 @@ ApplicationWindow {
 	property alias appService: appService;
 	property alias mainSettings: appSettings
 	property bool trackLastProject: true;
+	WelcomeViewStyle { id: welcomeViewStyleId }
 
 	ApplicationService {
 		id: appService
@@ -289,6 +310,7 @@ ApplicationWindow {
 		text: qsTr("Show Web View")
 		shortcut: "F2"
 		checkable: true
+		enabled: !projectModel.isEmpty
 		checked: mainContent.webViewVisible
 		onTriggered: mainContent.toggleWebPreview();
 	}
@@ -298,6 +320,7 @@ ApplicationWindow {
 		text: qsTr("Show Project Navigator")
 		shortcut: "Alt+0"
 		checkable: true
+		enabled: !projectModel.isEmpty
 		checked: mainContent.projectViewVisible
 		onTriggered: mainContent.toggleProjectView();
 	}
@@ -307,6 +330,7 @@ ApplicationWindow {
 		text: qsTr("Horizontal Web View")
 		shortcut: "Alt+W"
 		checkable: true
+		enabled: !projectModel.isEmpty
 		checked: mainContent.webViewHorizontal
 		onTriggered: mainContent.toggleWebPreviewOrientation();
 	}
@@ -325,6 +349,7 @@ ApplicationWindow {
 		text: qsTr("Show Right View")
 		shortcut: "F7"
 		checkable: true
+		enabled: !projectModel.isEmpty
 		checked: mainContent.rightViewVisible
 		onTriggered: mainContent.toggleRightView();
 	}
@@ -333,7 +358,7 @@ ApplicationWindow {
 		id: createProjectAction
 		text: qsTr("&New Project")
 		shortcut: "Ctrl+N"
-		enabled: true;
+		enabled: true
 		onTriggered: projectModel.createProject();
 	}
 

qml/BasicMessage.qml

@@ -1,3 +1,23 @@
+/*
+	This file is part of cpp-ethereum.
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file BasicMessage.qml
+ * @author Yann [email protected]
+ * @author Arkadiy Paronyan [email protected]
+ * @date 2015
+ * Ethereum IDE client.
+ */
+
 import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.1

qml/BigIntValue.qml

@@ -1,3 +1,23 @@
+/*
+	This file is part of cpp-ethereum.
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file BigIntValue.qml
+ * @author Yann [email protected]
+ * @author Arkadiy Paronyan [email protected]
+ * @date 2015
+ * Ethereum IDE client.
+ */
+
 /*
  * Used to instanciate a QEther obj using Qt.createComponent function.
 */

qml/Block.qml

@@ -1,3 +1,23 @@
+/*
+	This file is part of cpp-ethereum.
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file Block.qml
+ * @author Yann [email protected]
+ * @author Arkadiy Paronyan [email protected]
+ * @date 2015
+ * Ethereum IDE client.
+ */
+
 import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.1

qml/BlockChain.qml

@@ -1,3 +1,23 @@
+/*
+	This file is part of cpp-ethereum.
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file BlockChain.qml
+ * @author Yann [email protected]
+ * @author Arkadiy Paronyan [email protected]
+ * @date 2015
+ * Ethereum IDE client.
+ */
+
 import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.1
@@ -134,6 +154,7 @@ ColumnLayout {
 	{
 		model.blocks[_block].transactions.splice(_txIndex, 1)
 		blockModel.removeTransaction(_block, _txIndex)
+		rebuildRequired()
 	}
 
 	function getAccountNickname(address)
@@ -274,7 +295,7 @@ ColumnLayout {
 		anchors.leftMargin: 5
 		anchors.top: parent.top
 		anchors.topMargin: -4
-		spacing: 1
+		spacing: 10
 		id: rowBtns
 		Settings
 		{
@@ -315,6 +336,7 @@ ColumnLayout {
 				rebuildEnable = true;
 			}
 		}
+
 		ScenarioButton {
 			id: rebuild
 			text: qsTr("Rebuild Scenario")
@@ -470,11 +492,19 @@ ColumnLayout {
 			sourceImg: "qrc:/qml/img/[email protected]"
 		}
 
-		ScenarioButton {
-			id: addTransaction
-			text: qsTr("Add Transaction...")
-			enabled: scenarioIndex !== -1
-			onClicked:
+		DropdownButton
+		{
+			id: actionsButtons
+			width: btnWidth
+			height: 30
+			Component.onCompleted:
+			{
+				actions.push({ label: qsTr("Add Transaction...") , action: addTransaction })
+				actions.push({ label: qsTr("Mine Block") , action: mineBlock })
+				init()
+			}
+
+			function addTransaction()
 			{
 				if (model && model.blocks)
 				{
@@ -493,29 +523,8 @@ ColumnLayout {
 					transactionDialog.open(model.blocks[model.blocks.length - 1].transactions.length, model.blocks.length - 1, item)
 				}
 			}
-			width: btnWidth
-			Layout.minimumHeight: 30
-			buttonShortcut: ""
-			sourceImg: "qrc:/qml/img/[email protected]"
-			roundLeft: false
-			roundRight: false
-		}
-
-		Timer
-		{
-			id: ensureNotFuturetime
-			interval: 1000
-			repeat: false
-			running: false
-		}
 
-		ScenarioButton {
-			id: addBlockBtn
-			text: qsTr("Add Block")
-			enabled: scenarioIndex !== -1
-			roundLeft: false
-			roundRight: false
-			onClicked:
+			function mineBlock()
 			{
 				if (ensureNotFuturetime.running)
 					return
@@ -542,11 +551,14 @@ ColumnLayout {
 				model.blocks.push(block)
 				blockModel.appendBlock(block)
 			}
-			width: btnWidth
-			Layout.minimumHeight: 30
+		}
 
-			buttonShortcut: ""
-			sourceImg: "qrc:/qml/img/[email protected]"
+		Timer
+		{
+			id: ensureNotFuturetime
+			interval: 1000
+			repeat: false
+			running: false
 		}
 
 		Connections
@@ -563,7 +575,7 @@ ColumnLayout {
 					var lastB = blockModel.get(model.blocks.length - 1)
 					lastB.status = "mined"
 					lastB.number = model.blocks.length
-					addBlockBtn.addNewBlock()
+					actionsButtons.addNewBlock()
 				}
 			}
 			onStateCleared:
@@ -664,33 +676,6 @@ ColumnLayout {
 			{
 			}
 		}
-
-		ScenarioButton {
-			id: newAccount
-			enabled: scenarioIndex !== -1
-			text: qsTr("New Account...")
-			onClicked: {
-				newAddressWin.accounts = model.accounts
-				newAddressWin.open()
-			}
-			width: btnWidth
-			Layout.minimumHeight: 30
-			buttonShortcut: ""
-			sourceImg: "qrc:/qml/img/[email protected]"
-			roundLeft: false
-			roundRight: true
-		}
-
-		NewAccount
-		{
-			id: newAddressWin
-			onAccepted:
-			{
-				model.accounts.push(ac)
-				clientModel.addAccount(ac.secret);
-				projectModel.saveProject()
-			}
-		}
 	}
 
 	Rectangle
@@ -835,6 +820,7 @@ ColumnLayout {
 							else
 								return []
 						}
+
 						transactionModel:
 						{
 							if (index >= 0)

qml/CallStack.qml

@@ -1,3 +1,23 @@
+/*
+	This file is part of cpp-ethereum.
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file CallStack.qml
+ * @author Yann [email protected]
+ * @author Arkadiy Paronyan [email protected]
+ * @date 2015
+ * Ethereum IDE client.
+ */
+
 import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.1