Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

alethzero/MainWin.cpp

@@ -504,11 +504,12 @@ void Main::writeSettings()
 	s.setValue("windowState", saveState());
 }
 
-void Main::readSettings()
+void Main::readSettings(bool _skipGeometry)
 {
 	QSettings s("ethereum", "alethzero");
 
-	restoreGeometry(s.value("geometry").toByteArray());
+	if (!_skipGeometry)
+		restoreGeometry(s.value("geometry").toByteArray());
 	restoreState(s.value("windowState").toByteArray());
 
 	m_myKeys.clear();
@@ -531,6 +532,7 @@ void Main::readSettings()
 	ui->forceAddress->setText(s.value("forceAddress", "").toString());
 	ui->usePast->setChecked(s.value("usePast", true).toBool());
 	ui->forceMining->setChecked(s.value("forceMining", false).toBool());
+	on_forceMining_triggered();
 	ui->paranoia->setChecked(s.value("paranoia", false).toBool());
 	ui->showAll->setChecked(s.value("showAll", false).toBool());
 	ui->showAllAccounts->setChecked(s.value("showAllAccounts", false).toBool());
@@ -1351,7 +1353,7 @@ void Main::on_killBlockchain_triggered()
 	m_client.reset();
 	m_client.reset(new Client("AlethZero", Address(), string(), true));
 	m_ethereum->setClient(m_client.get());
-	readSettings();
+	readSettings(true);
 	installWatches();
 	refreshAll();
 }

alethzero/MainWin.h

@@ -157,7 +157,8 @@ private:
 	void alterDebugStateGroup(bool _enable) const;
 
 	void updateFee();
-	void readSettings();
+	void readSettings(bool _skipGeometry);
+	void readSettings() { readSettings(false); }
 	void writeSettings();
 
 	bool isCreation() const;

windows/LibEthereum.vcxproj

@@ -32,12 +32,7 @@
     <ClCompile Include="..\libethential\Common.cpp" />
     <ClCompile Include="..\libethential\CommonData.cpp" />
     <ClCompile Include="..\libethential\CommonIO.cpp" />
-    <ClCompile Include="..\libethential\FixedHash.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
+    <ClCompile Include="..\libethential\FixedHash.cpp" />
     <ClCompile Include="..\libethential\Log.cpp" />
     <ClCompile Include="..\libethential\RLP.cpp" />
     <ClCompile Include="..\libethereum\AddressState.cpp" />
@@ -55,6 +50,7 @@
     <ClCompile Include="..\libethereum\State.cpp" />
     <ClCompile Include="..\libethereum\Transaction.cpp" />
     <ClCompile Include="..\libethereum\TransactionQueue.cpp" />
+    <ClCompile Include="..\libethereum\Utility.cpp" />
     <ClCompile Include="..\libevmface\Instruction.cpp" />
     <ClCompile Include="..\libevm\ExtVMFace.cpp" />
     <ClCompile Include="..\libevm\FeeStructure.cpp" />
@@ -110,6 +106,7 @@
     <ClInclude Include="..\libethereum\State.h" />
     <ClInclude Include="..\libethereum\Transaction.h" />
     <ClInclude Include="..\libethereum\TransactionQueue.h" />
+    <ClInclude Include="..\libethereum\Utility.h" />
     <ClInclude Include="..\libevmface\Instruction.h" />
     <ClInclude Include="..\libevm\All.h" />
     <ClInclude Include="..\libevm\ExtVMFace.h" />

windows/LibEthereum.vcxproj.filters

@@ -124,6 +124,9 @@
     <ClCompile Include="..\libethereum\Manifest.cpp">
       <Filter>libethereum</Filter>
     </ClCompile>
+    <ClCompile Include="..\libethereum\Utility.cpp">
+      <Filter>libethereum</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
@@ -276,6 +279,9 @@
     <ClInclude Include="..\libethereum\Manifest.h">
       <Filter>libethereum</Filter>
     </ClInclude>
+    <ClInclude Include="..\libethereum\Utility.h">
+      <Filter>libethereum</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Windows">