From 500553d3b100a1aea2cbf4237eaa4c2302db9c6d Mon Sep 17 00:00:00 2001
From: Tim Hughes <tim@twistedfury.com>
Date: Tue, 29 Jul 2014 20:49:11 +0100
Subject: [PATCH 1/3] Updated VS2013 projects.

---
 windows/LibEthereum.vcxproj         | 9 +++------
 windows/LibEthereum.vcxproj.filters | 6 ++++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/windows/LibEthereum.vcxproj b/windows/LibEthereum.vcxproj
index c668fcb8e..454aee06a 100644
--- a/windows/LibEthereum.vcxproj
+++ b/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" />
diff --git a/windows/LibEthereum.vcxproj.filters b/windows/LibEthereum.vcxproj.filters
index 8421df84a..2fb0c3a39 100644
--- a/windows/LibEthereum.vcxproj.filters
+++ b/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">

From 694701c4902e1b5a415a6a9d65ded65c7fff87d7 Mon Sep 17 00:00:00 2001
From: Giacomo Tazzari <giacomo.tazzari@gmail.com>
Date: Tue, 29 Jul 2014 23:56:11 +0200
Subject: [PATCH 2/3] On startup, sets the "Force Mining" client option to
 match the settings loaded by the GUI

---
 alethzero/MainWin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp
index 0226ac35d..1fbaf5e76 100644
--- a/alethzero/MainWin.cpp
+++ b/alethzero/MainWin.cpp
@@ -531,6 +531,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());

From 59a858f45d26a380e423f421eb4bc61af889c08b Mon Sep 17 00:00:00 2001
From: Giacomo Tazzari <giacomo.tazzari@gmail.com>
Date: Wed, 30 Jul 2014 00:13:11 +0200
Subject: [PATCH 3/3] Allow MainWin::readSettings() to skip geometry
 restoration when killing the blockchain (it messes up widgets position when
 in full screen)

---
 alethzero/MainWin.cpp | 7 ++++---
 alethzero/MainWin.h   | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp
index 1fbaf5e76..a384f2fcb 100644
--- a/alethzero/MainWin.cpp
+++ b/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();
@@ -1352,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();
 }
diff --git a/alethzero/MainWin.h b/alethzero/MainWin.h
index 1098e3e1e..ac3d442d6 100644
--- a/alethzero/MainWin.h
+++ b/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;