Merge branch 'release-7.0.0-alpha.19'

bovender · Mar 16, 2016 · cb90bcd · cb90bcd
2 parents 98c8c0d + ed976c3
commit cb90bcd
Show file tree

Hide file tree

Showing 16 changed files with 93 additions and 51 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.18")]
-[assembly: AssemblyFileVersion("7.0.0.18")]
+[assembly: AssemblyVersion("7.0.0.19")]
+[assembly: AssemblyFileVersion("7.0.0.19")]
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-7.0.0-alpha.18
-7.0.0.18
+7.0.0-alpha.19
+7.0.0.19
diff --git a/XLToolbox/About/AboutView.xaml b/XLToolbox/About/AboutView.xaml
@@ -27,7 +27,7 @@
         xmlns:mvvm="clr-namespace:XLToolbox.Mvvm.Actions"
         SizeToContent="WidthAndHeight" ResizeMode="NoResize"
         Title="{x:Static l:Strings.AboutXLToolbox}" WindowStyle="None"
-        vs:WindowState.CenterScreen="True"
+        vs:WindowState.CenterScreen="True" Background="WhiteSmoke"
         >
     <Window.Resources>
         <ResourceDictionary Source="/Bovender;component/style.xaml" />
@@ -63,7 +63,7 @@
                     NG – Next Generation
                 </TextBlock>
                 <TextBlock TextAlignment="Center" Text="{Binding Version}" />
-                <TextBlock TextAlignment="Center">© Copyright Daniel Kraus 2014-2015</TextBlock>
+                <TextBlock TextAlignment="Center">© Copyright Daniel Kraus 2014-2016</TextBlock>
                 <TextBlock TextAlignment="Center">.NET &amp; VSTO © Copyright Microsoft Corp.</TextBlock>
                 <TextBlock TextAlignment="Center">FreeImage © Copyright Hervé Drolon &amp; others</TextBlock>
                 <TextBlock TextAlignment="Center">LittleCMS © Copyright Marti Maria Saguer</TextBlock>

diff --git a/XLToolbox/Csv/CsvFile.cs b/XLToolbox/Csv/CsvFile.cs
@@ -192,6 +192,9 @@ public void Export(Range range)
                     CellsTotal = range.CellsCount();
                     CellsProcessed = 0;
                     _cancelExport = false;
+                    string fs = FieldSeparator;
+                    if (fs == "\\t") { fs = "\t"; } // Convert "\t" to tab characters
+
 
                     // Get all values in an array
                     object[,] values = range.Value2;
@@ -206,7 +209,7 @@ public void Export(Range range)
                                 // If this is not the first field in the line, write a field separator.
                                 if (col > 1)
                                 {
-                                    sw.Write(FieldSeparator);
+                                    sw.Write(fs);
                                 }
 
                                 object value = values[row, col];
@@ -215,7 +218,7 @@ public void Export(Range range)
                                     if (value is string)
                                     {
                                         string s = value as string;
-                                        if (s.Contains(FieldSeparator) || s.Contains("\""))
+                                        if (s.Contains(fs) || s.Contains("\""))
                                         {
                                             s = "\"" + s.Replace("\"", "\"\"") + "\"";
                                         }

diff --git a/XLToolbox/Csv/CsvFileView.xaml b/XLToolbox/Csv/CsvFileView.xaml
@@ -26,7 +26,7 @@
     Title="{x:Static l:Strings.CsvSettings}"
     WindowStartupLocation="CenterScreen" x:Name="win"
     ResizeMode="CanResizeWithGrip" SizeToContent="WidthAndHeight"
-    MinWidth="240" MinHeight="200" MaxHeight="{Binding ElementName=win,Path=MinHeight}"
+    MinWidth="240" MinHeight="240" MaxHeight="{Binding ElementName=win,Path=MinHeight}"
     bov:WindowState.CenterScreen="True" bov:WindowState.Save="True"
     FocusManager.FocusedElement="{Binding ElementName=FieldSeparator}"
     >
@@ -70,6 +70,7 @@
                 <RowDefinition />
                 <RowDefinition />
                 <RowDefinition />
+                <RowDefinition />
             </Grid.RowDefinitions>
             <!-- Need to explicitly reference TextBox style; otherwise, first text box
             would not be styled (don't know why, WPF bug?) -->
@@ -79,16 +80,17 @@
             <TextBox Grid.Column="1" Grid.Row="0" x:Name="FieldSeparator" 
                      Margin="0 0 0 5" Style="{StaticResource ResourceKey=tb}"
                      Text="{Binding FieldSeparator}" TextAlignment="Center" />
-            <Label Grid.Column="0" Grid.Row="1" Margin="0 0 0 5"
+            <TextBlock Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Text="{x:Static l:Strings.HintUseBackslashT}" />
+            <Label Grid.Column="0" Grid.Row="2" Margin="0 0 0 5"
                    Target="{Binding ElementName=DecimalSeparator}"
                    Content="{x:Static l:Strings.DecimalSeparator}" />
-            <TextBox Grid.Column="1" Grid.Row="1" x:Name="DecimalSeparator" 
+            <TextBox Grid.Column="1" Grid.Row="2" x:Name="DecimalSeparator" 
                      Margin="0 0 0 5" Style="{StaticResource ResourceKey=tb}"
                      Text="{Binding DecimalSeparator}" TextAlignment="Center" />
-            <Label Grid.Column="0" Grid.Row="2" Margin="0 0 0 5"
+            <Label Grid.Column="0" Grid.Row="3" Margin="0 0 0 5"
                    Target="{Binding ElementName=ThousandsSeparator}"
                    Content="{x:Static l:Strings.ThousandsSeparator}" />
-            <TextBox Grid.Column="1" Grid.Row="2" x:Name="ThousandsSeparator" 
+            <TextBox Grid.Column="1" Grid.Row="3" x:Name="ThousandsSeparator" 
                      Margin="0 0 0 5" Style="{StaticResource ResourceKey=tb}"
                      Text="{Binding ThousandsSeparator}" TextAlignment="Center" />
         </Grid>

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.18")]
-[assembly: AssemblyFileVersion("7.0.0.18")]
+[assembly: AssemblyVersion("7.0.0.19")]
+[assembly: AssemblyFileVersion("7.0.0.19")]
diff --git a/XLToolbox/Strings.Designer.cs b/XLToolbox/Strings.Designer.cs
diff --git a/XLToolbox/Strings.resx b/XLToolbox/Strings.resx
@@ -624,4 +624,7 @@ You may want to try again.</value>
     <value>CSV export failed:
 {0}</value>
   </data>
+  <data name="HintUseBackslashT" xml:space="preserve">
+    <value>Hint: Use \t to separate fields by tabs.</value>
+  </data>
 </root>
diff --git a/XLToolbox/WorkbookStorage/Store.cs b/XLToolbox/WorkbookStorage/Store.cs
@@ -242,7 +242,7 @@ public int Get(string key, int def, int min, int max)
         {
             if (HasKey(key))
             {
-                int i = (int)GetDynamicValue(key);
+                int i = Convert.ToInt32(GetDynamicValue(key));
                 if (i < min)
                 {
                     i = min;
@@ -263,7 +263,7 @@ public string Get(string key, string def)
         {
             if (HasKey(key))
             {
-                return (string)GetDynamicValue(key);
+                return Convert.ToString(GetDynamicValue(key));
             }
             else
             {
@@ -275,7 +275,7 @@ public bool Get(string key, bool def)
         {
             if (HasKey(key))
             {
-                return (bool)GetDynamicValue(key);
+                return Convert.ToBoolean(GetDynamicValue(key));
             }
             else
             {

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.18")]
-[assembly: AssemblyFileVersion("7.0.0.18")]
+[assembly: AssemblyVersion("7.0.0.19")]
+[assembly: AssemblyFileVersion("7.0.0.19")]
 
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/XLToolboxForExcel/Properties/Settings.Designer.cs b/XLToolboxForExcel/Properties/Settings.Designer.cs
diff --git a/XLToolboxForExcel/Properties/Settings.settings b/XLToolboxForExcel/Properties/Settings.settings
@@ -29,5 +29,8 @@
     <Setting Name="DumpFile" Type="System.String" Scope="Application">
       <Value Profile="(Default)">xltoolbox-dump.txt</Value>
     </Setting>
+    <Setting Name="NeedUpgrade" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
-</SettingsFile>
+</SettingsFile>
diff --git a/XLToolboxForExcel/Ribbon.cs b/XLToolboxForExcel/Ribbon.cs
@@ -74,7 +74,7 @@ public Ribbon()
                 { "ButtonSaveCsv", Command.SaveCsv },
                 { "ButtonSaveCsvWithParams", Command.SaveCsvWithParams },
                 { "ButtonSaveCsvRange", Command.SaveCsvRange },
-                { "ButtonSaveCsvRangeWithParams", Command.SaveCsvWithParams },
+                { "ButtonSaveCsvRangeWithParams", Command.SaveCsvRangeWithParams},
             };
 
             XLToolbox.Versioning.UpdaterViewModel.Instance.PropertyChanged += UpdaterViewModel_PropertyChanged;

diff --git a/XLToolboxForExcel/ThisAddIn.cs b/XLToolboxForExcel/ThisAddIn.cs
@@ -163,7 +163,13 @@ private void PrepareConfig()
                 {
                     System.IO.File.Delete(config.FilePath);
                 }
-                Properties.Settings.Default.Upgrade();
+
+                if (Properties.Settings.Default.NeedUpgrade)
+                {
+                    Properties.Settings.Default.Upgrade();
+                    Properties.Settings.Default.NeedUpgrade = false;
+                    Properties.Settings.Default.Save();
+                }
             }
         }
 

diff --git a/XLToolboxForExcel/app.config b/XLToolboxForExcel/app.config
@@ -29,31 +29,34 @@
     </configSections>
     <userSettings>
 		<XLToolboxForExcel.Properties.Settings>
-            <setting name="DownloadPath" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="LastUpdateSeen" serializeAs="String">
-                <value>0.0.0</value>
-            </setting>
-            <setting name="LastUpdateCheck" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="UpdateCheckInterval" serializeAs="String">
-                <value>7</value>
-            </setting>
-            <setting name="LastVersionSeen" serializeAs="String">
-                <value>0.0.0</value>
-            </setting>
-            <setting name="UsersName" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="UsersEmail" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="CcUser" serializeAs="String">
-                <value>False</value>
-            </setting>
-        </XLToolboxForExcel.Properties.Settings>
+      <setting name="DownloadPath" serializeAs="String">
+          <value />
+      </setting>
+      <setting name="LastUpdateSeen" serializeAs="String">
+          <value>0.0.0</value>
+      </setting>
+      <setting name="LastUpdateCheck" serializeAs="String">
+          <value />
+      </setting>
+      <setting name="UpdateCheckInterval" serializeAs="String">
+          <value>7</value>
+      </setting>
+      <setting name="LastVersionSeen" serializeAs="String">
+          <value>0.0.0</value>
+      </setting>
+      <setting name="UsersName" serializeAs="String">
+          <value />
+      </setting>
+      <setting name="UsersEmail" serializeAs="String">
+          <value />
+      </setting>
+      <setting name="CcUser" serializeAs="String">
+          <value>False</value>
+      </setting>
+      <setting name="NeedUpgrade" serializeAs="String">
+          <value>True</value>
+      </setting>
+  </XLToolboxForExcel.Properties.Settings>
     </userSettings>
     <applicationSettings>
         <XLToolboxForExcel.Properties.Settings>

diff --git a/publish/ng.iss b/publish/ng.iss
@@ -1,5 +1,5 @@
 ; Inno Setup script for Daniel's XL Toolbox
-; (c) 2008-2015 Daniel Kraus
+; (c) 2008-2016 Daniel Kraus
 ; Apache License Version 2.0
 
 [Setup]
@@ -11,7 +11,7 @@
 #define VER FileRead(FILE_HANDLE)
 #expr FileClose(FILE_HANDLE)
 
-#define YEAR "2015"
+#define YEAR "2016"
 #define DEV "Daniel Kraus"
 #define LOGFILE "INST-LOG.TXT"
 #define REGKEY "Software\Microsoft\Office\Excel\Addins\XL Toolbox NG"
@@ -110,7 +110,8 @@ Source: "setup-files\xltoolbox.ico"; DestDir: "{#UNINSTALLDIR}"
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Registry]
-ValueName: EnableVSTOLocalUNC; ValueData: 1; ValueType: dword; Root: HKLM; Subkey: SOFTWARE\Microsoft\Vsto Runtime Setup\v4
+ValueName: EnableVSTOLocalUNC; ValueData: 1; ValueType: dword; Root: HKLM; Subkey: SOFTWARE\Microsoft\Vsto Runtime Setup\v4; Flags: noerror
+
 ; Keys for single-user install (HKCU)
 Check: not IsMultiUserInstall; ValueName: Description; ValueData: {#SLOGAN}; ValueType: string; Root: HKCU; Subkey: {#REGKEY}; Flags: uninsdeletekey
 Check: not IsMultiUserInstall; ValueName: FriendlyName; ValueData: {#APPNAME}; ValueType: string; Root: HKCU; Subkey: {#REGKEY}; Flags: uninsdeletekey