Merge branch 'release-7.0.0-alpha.18'

bovender · Nov 9, 2015 · 98c8c0d · 98c8c0d
2 parents f7f9313 + 42157d3
commit 98c8c0d
Show file tree

Hide file tree

Showing 23 changed files with 140 additions and 64 deletions.
diff --git a/Tests/Properties/AssemblyInfo.cs b/Tests/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.0.0.17")]
-[assembly: AssemblyFileVersion("7.0.0.17")]
+[assembly: AssemblyVersion("7.0.0.18")]
+[assembly: AssemblyFileVersion("7.0.0.18")]
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -51,15 +51,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Debug %28Bovender via NuGet%29'">
-    <Reference Include="Bovender, Version=0.4.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.5.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.4.0.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.5.0.0\lib\net40\Bovender.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Release'">
-    <Reference Include="Bovender, Version=0.4.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.5.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.4.0.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.5.0.0\lib\net40\Bovender.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Tests/packages.config b/Tests/packages.config
@@ -19,7 +19,7 @@
 	limitations under the License.
 -->
 <packages>
-  <package id="Bovender" version="0.4.0.0" targetFramework="net40" />
+  <package id="Bovender" version="0.5.0.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
   <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net40" />
 </packages>
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-7.0.0-alpha.17
-7.0.0.17
+7.0.0-alpha.18
+7.0.0.18
diff --git a/XLToolbox/About/AboutView.xaml b/XLToolbox/About/AboutView.xaml
@@ -26,8 +26,8 @@
         xmlns:vs="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
         xmlns:mvvm="clr-namespace:XLToolbox.Mvvm.Actions"
         SizeToContent="WidthAndHeight" ResizeMode="NoResize"
-        Title="{x:Static l:Strings.AboutXLToolbox}"
-        vs:WindowState.Save="True" vs:WindowState.CenterScreen="True"
+        Title="{x:Static l:Strings.AboutXLToolbox}" WindowStyle="None"
+        vs:WindowState.CenterScreen="True"
         >
     <Window.Resources>
         <ResourceDictionary Source="/Bovender;component/style.xaml" />

diff --git a/XLToolbox/Csv/CsvExportViewModel.cs b/XLToolbox/Csv/CsvExportViewModel.cs
@@ -206,8 +206,11 @@ private void ConfirmChooseFileName(FileNameMessageContent messageContent)
 
         private void DoExport()
         {
-            WorkbookStorage.Store store = new WorkbookStorage.Store();
-            store.Put("csv_path", System.IO.Path.GetDirectoryName(FileName));
+            using (WorkbookStorage.Store store = new WorkbookStorage.Store())
+            {
+                store.Put("csv_path", System.IO.Path.GetDirectoryName(FileName));
+
+            };
             _progressTimer = new Timer(UpdateProgress, null, 1000, 300);
             if (Range != null)
             {
@@ -227,7 +230,10 @@ void CsvFile_ExportProgressCompleted(object sender, EventArgs e)
 
         void CsvFile_ExportFailed(object sender, System.IO.ErrorEventArgs e)
         {
-            ExportFailedMessage.Send(new StringMessageContent(e.GetException().Message));
+            ExportFailedMessage.Send(
+                new StringMessageContent(
+                    String.Format(Strings.CsvExportFailed,
+                    e.GetException().Message)));
         }
 
         void UpdateProgress(object state)
@@ -243,7 +249,7 @@ void UpdateProgress(object state)
             if (_csvFile.IsProcessing)
             {
                 ExportProcessMessageContent.PercentCompleted =
-                   Convert.ToInt32(_csvFile.CellsProcessed * 100 / _csvFile.CellsTotal);
+                   Convert.ToInt32(100d * _csvFile.CellsProcessed / _csvFile.CellsTotal);
             }
             else
             {

diff --git a/XLToolbox/Csv/CsvFile.cs b/XLToolbox/Csv/CsvFile.cs
@@ -183,11 +183,12 @@ public void Export(Range range)
             IsProcessing = true;
             Task t = new Task(() =>
             {
+                StreamWriter sw = null;
                 try
                 {
                     // StreamWriter buffers the output; using a StringBuilder
                     // doesn't speed up things (tried it)
-                    StreamWriter sw = File.CreateText(FileName);
+                    sw = File.CreateText(FileName);
                     CellsTotal = range.CellsCount();
                     CellsProcessed = 0;
                     _cancelExport = false;
@@ -222,7 +223,7 @@ public void Export(Range range)
                                     }
                                     else
                                     {
-                                        double d = (double)value;
+                                        double d = Convert.ToDouble(value);
                                         sw.Write(d.ToString(NumberFormatInfo));
                                     }
                                 }
@@ -231,7 +232,8 @@ public void Export(Range range)
                             sw.WriteLine();
                             if (_cancelExport)
                             {
-                                sw.WriteLine("*** UNFINISHED EXPORT ***");
+                                sw.WriteLine(UNFINISHED_EXPORT);
+                                sw.WriteLine("Cancelled by user.");
                             }
                         }
                     }
@@ -240,8 +242,20 @@ public void Export(Range range)
                 }
                 catch (IOException e)
                 {
+                    IsProcessing = false;
                     OnExportFailed(e);
                 }
+                catch (Exception e1)
+                {
+                    IsProcessing = false;
+                    if (sw != null)
+                    {
+                        sw.WriteLine(UNFINISHED_EXPORT);
+                        sw.WriteLine(e1.ToString());
+                        sw.Close();
+                    }
+                    OnExportFailed(e1);
+                }
                 finally
                 {
                     IsProcessing = false;
@@ -301,6 +315,7 @@ protected virtual void OnExportFailed(Exception e)
                 handler(this, new ErrorEventArgs(e));
             }
         }
+
         #endregion
 
         #region Fields
@@ -309,5 +324,10 @@ protected virtual void OnExportFailed(Exception e)
         bool _cancelExport;
 
         #endregion
+
+        #region Private constant
+
+        const string UNFINISHED_EXPORT = "*** UNFINISHED EXPORT ***";
+        #endregion
     }
 }
diff --git a/XLToolbox/Csv/CsvImportViewModel.cs b/XLToolbox/Csv/CsvImportViewModel.cs
@@ -171,8 +171,10 @@ private void ConfirmChooseFileName(FileNameMessageContent messageContent)
 
         private void DoImport()
         {
-            WorkbookStorage.Store store = new WorkbookStorage.Store();
-            store.Put("csv_path", System.IO.Path.GetDirectoryName(FileName));
+            using (WorkbookStorage.Store store = new WorkbookStorage.Store())
+            {
+                store.Put("csv_path", System.IO.Path.GetDirectoryName(FileName));
+            }
             _csvFile.Import();
             CloseViewCommand.Execute(null);
         }

diff --git a/XLToolbox/Export/Models/BatchExportSettings.cs b/XLToolbox/Export/Models/BatchExportSettings.cs
@@ -107,10 +107,12 @@ public void Store()
         public void Store(Workbook workbookContext)
         {
             Store();
-            Store store = new Store(workbookContext);
-            store.Put<BatchExportSettings>(
-                typeof(BatchExportSettings).ToString(),
-                this);
+            using (Store store = new Store(workbookContext))
+            {
+                store.Put<BatchExportSettings>(
+                    typeof(BatchExportSettings).ToString(),
+                    this);
+            }
         }
 
         #endregion

diff --git a/XLToolbox/Export/ViewModels/ScreenshotExporterViewModel.cs b/XLToolbox/Export/ViewModels/ScreenshotExporterViewModel.cs
@@ -91,8 +91,10 @@ private void DoExportSelection(FileNameMessageContent messageContent)
         {
             if (CanExportSelection() && messageContent.Confirmed)
             {
-                WorkbookStorage.Store store = new WorkbookStorage.Store();
-                store.Put(Properties.StoreNames.Default.ExportPath, messageContent.Value);
+                using (WorkbookStorage.Store store = new WorkbookStorage.Store())
+                {
+                    store.Put(Properties.StoreNames.Default.ExportPath, messageContent.Value);
+                }
                 Properties.Settings.Default.ExportPath =
                     Bovender.PathHelpers.GetDirectoryPart(messageContent.Value);
                 ScreenshotExporter exporter = new ScreenshotExporter();

diff --git a/XLToolbox/Properties/AssemblyInfo.cs b/XLToolbox/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.0.0.17")]
-[assembly: AssemblyFileVersion("7.0.0.17")]
+[assembly: AssemblyVersion("7.0.0.18")]
+[assembly: AssemblyFileVersion("7.0.0.18")]
diff --git a/XLToolbox/Properties/Settings.Designer.cs b/XLToolbox/Properties/Settings.Designer.cs
diff --git a/XLToolbox/Properties/Settings.settings b/XLToolbox/Properties/Settings.settings
@@ -3,16 +3,16 @@
   <Profiles />
   <Settings>
     <Setting Name="WebsiteUrl" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">http://xltoolbox.net</Value>
+      <Value Profile="(Default)">http://www.xltoolbox.net</Value>
     </Setting>
     <Setting Name="VersionInfoUrl" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">http://xltoolbox.net/version-ng.txt</Value>
+      <Value Profile="(Default)">http://www.xltoolbox.net/version-ng.txt</Value>
     </Setting>
     <Setting Name="HelpUrl" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">http://xltoolbox.net/</Value>
+      <Value Profile="(Default)">http://www.xltoolbox.net/</Value>
     </Setting>
     <Setting Name="ExceptionPostUrl" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">http://xltoolbox.net/receive.php</Value>
+      <Value Profile="(Default)">http://www.xltoolbox.net/receive.php</Value>
     </Setting>
     <Setting Name="DownloadPath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
@@ -33,10 +33,10 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="DonateUrl" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">http://xltoolbox.net/donate</Value>
+      <Value Profile="(Default)">http://www.xltoolbox.net/donate</Value>
     </Setting>
     <Setting Name="WhatsNewUrl" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">http://xltoolbox.net/blog/tags/alpha</Value>
+      <Value Profile="(Default)">http://www.xltoolbox.net/blog/tags/alpha</Value>
     </Setting>
     <Setting Name="WindowManagerAlwaysOnTop" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>

diff --git a/XLToolbox/Strings.Designer.cs b/XLToolbox/Strings.Designer.cs
diff --git a/XLToolbox/Strings.resx b/XLToolbox/Strings.resx
@@ -620,4 +620,8 @@ You may want to try again.</value>
   <data name="BovenderFramework" xml:space="preserve">
     <value>Bovender framework</value>
   </data>
-</root>
+  <data name="CsvExportFailed" xml:space="preserve">
+    <value>CSV export failed:
+{0}</value>
+  </data>
+</root>
diff --git a/XLToolbox/XLToolbox.csproj b/XLToolbox/XLToolbox.csproj
@@ -51,15 +51,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Debug %28Bovender via NuGet%29|AnyCPU'">
-    <Reference Include="Bovender, Version=0.4.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.5.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.4.0.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.5.0.0\lib\net40\Bovender.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Release'">
-    <Reference Include="Bovender, Version=0.4.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.5.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.4.0.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.5.0.0\lib\net40\Bovender.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/XLToolbox/app.config b/XLToolbox/app.config
@@ -36,25 +36,25 @@
         </XLToolbox.StoreNames>
         <XLToolbox.Properties.Settings>
             <setting name="WebsiteUrl" serializeAs="String">
-                <value>http://xltoolbox.net</value>
+                <value>http://www.xltoolbox.net</value>
             </setting>
             <setting name="VersionInfoUrl" serializeAs="String">
-                <value>http://xltoolbox.net/version-ng.txt</value>
+                <value>http://www.xltoolbox.net/version-ng.txt</value>
             </setting>
             <setting name="HelpUrl" serializeAs="String">
-                <value>http://xltoolbox.net/</value>
+                <value>http://www.xltoolbox.net/</value>
             </setting>
             <setting name="ExceptionPostUrl" serializeAs="String">
-                <value>http://xltoolbox.net/receive.php</value>
+                <value>http://www.xltoolbox.net/receive.php</value>
             </setting>
             <setting name="AddinName" serializeAs="String">
                 <value>Daniel's XL Toolbox</value>
             </setting>
             <setting name="DonateUrl" serializeAs="String">
-                <value>http://xltoolbox.net/donate</value>
+                <value>http://www.xltoolbox.net/donate</value>
             </setting>
             <setting name="WhatsNewUrl" serializeAs="String">
-                <value>http://xltoolbox.net/blog/tags/alpha</value>
+                <value>http://www.xltoolbox.net/blog/tags/alpha</value>
             </setting>
         </XLToolbox.Properties.Settings>
     </applicationSettings>

diff --git a/XLToolbox/packages.config b/XLToolbox/packages.config
@@ -19,7 +19,7 @@
 	limitations under the License.
 -->
 <packages>
-  <package id="Bovender" version="0.4.0.0" targetFramework="net40" />
+  <package id="Bovender" version="0.5.0.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
   <package id="NUnit" version="2.6.4" targetFramework="net40" />
 </packages>
diff --git a/XLToolboxForExcel/Properties/AssemblyInfo.cs b/XLToolboxForExcel/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.0.0.17")]
-[assembly: AssemblyFileVersion("7.0.0.17")]
+[assembly: AssemblyVersion("7.0.0.18")]
+[assembly: AssemblyFileVersion("7.0.0.18")]
 
 [assembly: NeutralResourcesLanguageAttribute("en-US")]