Merge branch 'release-7.0.0-beta.1'

bovender · Mar 30, 2016 · bbfaf75 · bbfaf75
2 parents cb90bcd + e7cc9e3
commit bbfaf75
Show file tree

Hide file tree

Showing 29 changed files with 1,383 additions and 48 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "publish/VstoAddinInstaller"]
+	path = publish/VstoAddinInstaller
+	url = [email protected]:bovender/VstoAddinInstaller.git
diff --git a/README.md b/README.md
@@ -1,13 +1,10 @@
 XL Toolbox NG (Next Generation)
 ===============================
 
-The XL Toolbox NG source code is written in (mostly) C# with Visual Studio
-Professional 2013 and target for the .NET framework 4.0.
-
-For more information about this project, see <http://xltoolbox.sf.net>.
+For more information about this project, see <http://www.xltoolbox.net>.
 
-This project uses the Git source code management system. You can find the
-repository at <https://sf.net/p/xltoolbox/ng-code>.
+The XL Toolbox NG source code is written in (mostly) C# with Visual Studio
+Professional 2013 and targeted for the .NET framework 4.0.
 
 
 Building the Debug configuration
@@ -112,7 +109,7 @@ License
 -------
 
     Daniel's XL Toolbox NG
-    Copyright (C) 2014-2015  Daniel Kraus  <xltoolbox@gmx.net>
+    Copyright (C) 2014-2016  Daniel Kraus <[email protected]>, <daniel@xltoolbox.net>
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.

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.19")]
-[assembly: AssemblyFileVersion("7.0.0.19")]
+[assembly: AssemblyVersion("7.0.0.20")]
+[assembly: AssemblyFileVersion("7.0.0.20")]
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-7.0.0-alpha.19
-7.0.0.19
+7.0.0-beta.1
+7.0.0.20
diff --git a/XLToolbox/Command.cs b/XLToolbox/Command.cs
@@ -39,5 +39,35 @@ public enum Command
         SaveCsvWithParams,
         SaveCsvRange,
         SaveCsvRangeWithParams,
+        OpenFromCell,
+        CopyPageSetup,
+        SelectAllShapes,
+        Anova1Way,
+        AnovaRepeat,
+        Anova2Way,
+        FormulaBuilder,
+        SelectionAssistant,
+        LinearRegression,
+        Correlation,
+        TransposeWizard,
+        MultiHisto,
+        Allocate,
+        LastErrorBars,
+        AutomaticErrorBars,
+        InteractiveErrorBars,
+        ChartDesign,
+        MoveDataSeriesLeft,
+        MoveDataSeriesRight,
+        Annotate,
+        SpreadScatter,
+        SeriesToFront,
+        SeriesForward,
+        SeriesBackward,
+        SeriesToBack,
+        AddSeries,
+        CopyChart,
+        PointChart,
+        Watermark,
+        Prefs,
     }
 }
diff --git a/XLToolbox/Csv/CsvExportViewModel.cs b/XLToolbox/Csv/CsvExportViewModel.cs
@@ -188,9 +188,9 @@ public override object RevealModelObject()
         private void DoChooseFileName()
         {
             WorkbookStorage.Store store = new WorkbookStorage.Store();
+            string defaultPath = Excel.ViewModels.Instance.Default.ActivePath;
             ChooseExportFileNameMessage.Send(
-                new FileNameMessageContent(
-                    store.Get("csv_path", Excel.ViewModels.Instance.Default.ActiveWorkbook.Path),
+                new FileNameMessageContent(store.Get("csv_path", defaultPath),
                     "CSV files|*.csv;*.txt;*.dat|All files|*.*"),
                 ConfirmChooseFileName);
         }

diff --git a/XLToolbox/Csv/CsvImportViewModel.cs b/XLToolbox/Csv/CsvImportViewModel.cs
@@ -155,7 +155,7 @@ private void DoChooseFileName()
             WorkbookStorage.Store store = new WorkbookStorage.Store();
             ChooseImportFileNameMessage.Send(
                 new FileNameMessageContent(
-                    store.Get("csv_path", Excel.ViewModels.Instance.Default.ActiveWorkbook.Path),
+                    store.Get("csv_path", Excel.ViewModels.Instance.Default.ActivePath),
                     "CSV files|*.csv;*.txt;*.dat|All files|*.*"),
                 ConfirmChooseFileName);
         }

diff --git a/XLToolbox/Dispatcher.cs b/XLToolbox/Dispatcher.cs
@@ -71,6 +71,37 @@ public static void Execute(Command cmd)
                     case Command.SaveCsvWithParams: SaveCsvWithSettings(); break;
                     case Command.SaveCsvRange: SaveCsvRange(); break;
                     case Command.SaveCsvRangeWithParams: SaveCsvRangeWithSettings(); break;
+                    case Command.Anova1Way: Anova1Way(); break;
+                    case Command.Anova2Way: Anova2Way(); break;
+                    case Command.AnovaRepeat: LastAnova(); break;
+                    case Command.AutomaticErrorBars: ErrorBarsAutomatic(); break;
+                    case Command.InteractiveErrorBars: ErrorBarsInteractive(); break;
+                    case Command.LastErrorBars: LastErrorBars(); break;
+                    case Command.OpenFromCell:
+                    case Command.CopyPageSetup:
+                    case Command.SelectAllShapes:
+                    case Command.FormulaBuilder:
+                    case Command.SelectionAssistant:
+                    case Command.LinearRegression:
+                    case Command.Correlation:
+                    case Command.TransposeWizard:
+                    case Command.MultiHisto:
+                    case Command.Allocate:
+                    case Command.ChartDesign:
+                    case Command.MoveDataSeriesLeft:
+                    case Command.MoveDataSeriesRight:
+                    case Command.Annotate:
+                    case Command.SpreadScatter:
+                    case Command.SeriesToFront:
+                    case Command.SeriesForward:
+                    case Command.SeriesBackward:
+                    case Command.SeriesToBack:
+                    case Command.AddSeries:
+                    case Command.CopyChart:
+                    case Command.PointChart:
+                    case Command.Watermark:
+                    case Command.Prefs:
+                        Legacy.LegacyToolbox.Default.RunCommand(cmd); break;
                     default:
                         throw new NotImplementedException("Don't know what to do with " + cmd.ToString());
                 }
@@ -239,6 +270,48 @@ static void SaveCsvRangeWithSettings()
             }
         }
 
+        static void Anova1Way()
+        {
+            Properties.Settings.Default.LastAnova = 1;
+            Properties.Settings.Default.Save();
+            Legacy.LegacyToolbox.Default.RunCommand(Command.Anova1Way);
+        }
+
+        static void Anova2Way()
+        {
+            Properties.Settings.Default.LastAnova = 2;
+            Properties.Settings.Default.Save();
+            Legacy.LegacyToolbox.Default.RunCommand(Command.Anova2Way);
+        }
+
+        static void LastAnova()
+        {
+            Command c = Properties.Settings.Default.LastAnova == 2 ?
+                Command.Anova2Way : Command.Anova1Way;
+            Legacy.LegacyToolbox.Default.RunCommand(c);
+        }
+
+        static void ErrorBarsAutomatic()
+        {
+            Properties.Settings.Default.LastErrorBars = 1;
+            Properties.Settings.Default.Save();
+            Legacy.LegacyToolbox.Default.RunCommand(Command.AutomaticErrorBars);
+        }
+
+        static void ErrorBarsInteractive()
+        {
+            Properties.Settings.Default.LastErrorBars = 2;
+            Properties.Settings.Default.Save();
+            Legacy.LegacyToolbox.Default.RunCommand(Command.InteractiveErrorBars);
+        }
+
+        static void LastErrorBars()
+        {
+            Command c = Properties.Settings.Default.LastErrorBars == 2 ? 
+                Command.InteractiveErrorBars : Command.AutomaticErrorBars;
+            Legacy.LegacyToolbox.Default.RunCommand(c);
+        }
+
         #endregion
 
         #region Private helper methods

diff --git a/XLToolbox/Excel/ViewModels/Instance.cs b/XLToolbox/Excel/ViewModels/Instance.cs
@@ -149,6 +149,25 @@ public Workbook ActiveWorkbook
             }
         }
 
+        /// <summary>
+        /// Returns the active path. This is either the path
+        /// of the active workbook, or the current working
+        /// directory.
+        /// </summary>
+        /// <remarks>
+        /// If a workbook is opened as in Protected View and
+        /// is the only open workbook, Application.ActiveWorkbook
+        /// will be null. Therefore this helper property was
+        /// invented.
+        /// </remarks>
+        public string ActivePath
+        {
+            get
+            {
+                return ActiveWorkbook == null ? System.IO.Directory.GetCurrentDirectory() : ActiveWorkbook.Path;
+            }
+        }
+
         /// <summary>
         /// Gets the Excel version and build number in a human-friendly form.
         /// </summary>