Merge branch 'release-7.0.0-beta.7'

.gitignore

@@ -16,10 +16,9 @@ publish/release/
 x64/
 win32/
 [Rr]elease/
-[Dd]debug/
+[Dd]ebug/
 Dist/
 build/
 lib/
 source.zip
 7za.exe
-doc/

.gitmodules

@@ -1,3 +1,7 @@
 [submodule "publish/VstoAddinInstaller"]
 	path = publish/VstoAddinInstaller
 	url = [email protected]:bovender/VstoAddinInstaller.git
+[submodule "doc"]
+	path = doc
+	url = [email protected]:bovender/XLToolbox.git
+	branch = gh-pages

Doxyfile

@@ -58,7 +58,7 @@ PROJECT_LOGO           = XLToolbox/Resources/images/xltoolbox-blender-icon.png
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = doc
+OUTPUT_DIRECTORY       = 
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -839,7 +839,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = ./FreeImage
+EXCLUDE                = ./FreeImage README.md ./publish/VstoAddinInstaller
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -1088,7 +1088,7 @@ GENERATE_HTML          = YES
 # The default directory is: html.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_OUTPUT            = html
+HTML_OUTPUT            = doc
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
 # generated HTML page (for example: .htm, .php, .asp).

LICENSE-NLOG.TXT

@@ -1,4 +1,4 @@
-NLog
+NLog <http://nlog-project.org>
 
 Copyright (c) 2004-2016 Jaroslaw Kowalski <[email protected]>, Kim Christensen, Julian Verdurmen
 

NOTICE.TXT

@@ -1,7 +1,7 @@
 Daniel's XL Toolbox NG add-in for Microsoft(R) Excel(R)
 =======================================================
 
-(c) Copyright 2014-2015 Daniel Kraus
+(c) Copyright 2014-2016 Daniel Kraus
 
 
 This program contains code by other parties:
@@ -66,6 +66,33 @@ NLog
 
 (c) 2004-2016 Jaroslaw Kowalski <[email protected]>, Kim Christensen, Julian Verdurmen
 
-Used under the BSD license.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+* Redistributions of source code must retain the above copyright notice, 
+  this list of conditions and the following disclaimer. 
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution. 
+
+* Neither the name of Jaroslaw Kowalski nor the names of its 
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
+THE POSSIBILITY OF SUCH DAMAGE.
 
 <!-- vim: set tw=72 : -->

README-DOCS.md

@@ -1,35 +1,14 @@
-\mainpage
+@mainpage
 
-This is the documentation of the source code of Daniel's XL Toolbox,
-Next Generation (NG).
+This is the documentation of the [source 
+code](https://github.com/bovender/XLToolbox) of [Daniel's XL 
+Toolbox](https://www.xltoolbox.net), Next Generation (NG).
 
-The solution consists of three main C# projects and two test projects:
 
-- `Bovender` is my assembly with reusable code; most importantly, my
-  Model--View--View Model framework is defined in here (see namespace
-  Mvvm).
-- `XLToolbox` contains almost all the Excel-specific code. A central
-  class is the Dispatcher class which provides user-entry points.
-- `Addin` is a small assembly that is called by the VSTO engine; it
-  implements an ThisAddIn_Startup method and a Ribbon. The Ribbon calls
-  into the Dispatcher class defined in the XLToolbox assembly.
-- `UnitTests` contains tests for the XLToolbox assembly.
-- `BovenderUnitTests` contains tests for the Bovender assembly.
-
-There are two main namespaces:
-
-- XLToolbox
-- Bovender
-
-The tests are in the XLToolbox.Test and Bovender.Test namespaces.
-
-When I have time, I will describe my MVVM framework further.
-
---Daniel
 
 -----
 
-	Copyright 2014-2015 Daniel Kraus
+	Copyright 2014-2016 Daniel Kraus
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.

README.md

@@ -1,13 +1,46 @@
-XL Toolbox NG (Next Generation)
+XL Toolbox NG (Next Generation) ![Downloads of the NG series](https://img.shields.io/github/downloads/bovender/xltoolbox/total.svg?maxAge=2592000)
 ===============================
 
-For more information about this project, see <http://www.xltoolbox.net>.
+##### Data analysis and visualization for Excel&reg;, for free.
+
+> For more information about this project, see <https://www.xltoolbox.net>.
 
 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
+Code documentation
+------------------
+
+For my own sake, I try to document the code well. In addition to the 
+comments in the source code, you can find 
+[Doxygen](http://www.doxygen.org)-generated pages at 
+<https://bovender.github.io/XLToolbox> (or check out the `gh-pages` 
+branch).
+
+
+Building the project
+--------------------
+
+Some additional DLLs (FreeImage, LCMS) as well as the VisualStudio 
+solution user options file (`NG.v12.suo`) are not included in the Git 
+repository and must be manually taken care of after cloning the 
+repository:
+
+- __FreeImage.DLL:__ Load the FreeImage solution contained in the XL 
+  Toolbox respository, build the `FreeImage` project (not the 'Plus' 
+  project) for both `x86` and `amd64` configurations, then copy the 
+  resulting DLLs to `XLToolbox\lib\Win32` and `XLToolbox\lib\x64` as 
+  appropriate.
+- __LCMS.DLL:__ Clone the repository from 
+  <https://github.com/mm2/Little-CMS>, load a project file from the 
+  `Projects` subfolder, build the library for both 32-bit and 64-bit, 
+  and copy the DLLs into the same folders as described above.
+- Change the startup project of the XLToolbox solution to 
+  `XLToolboxForExcel` by right-clicking on this project.
+
+
+Notes regarding Debug configuration
 --------------------------------
 
 The Visual Studio project files have been hand-edited to use different

Tests/Csv/CsvFileTest.cs

@@ -71,7 +71,7 @@ public void ExportLargeCsv()
             string fn = System.IO.Path.GetTempFileName();
             csv.FileName = fn;
             bool progressCompletedRaised = false;
-            csv.ExportProgressCompleted += (sender, args) =>
+            csv.ProcessSucceeded += (sender, args) =>
             {
                 progressCompletedRaised = true;
             };
@@ -110,7 +110,7 @@ public void CsvExportPerformance()
             csv.FileName = fn;
             bool running = true;
             long start = 0;
-            csv.ExportProgressCompleted += (sender, args) =>
+            csv.ProcessSucceeded += (sender, args) =>
             {
                 Console.WriteLine(method + ": *** Export completed ***");
                 long stop = DateTime.Now.Ticks;

Tests/Export/ExporterTest.cs

@@ -122,7 +122,7 @@ public void BatchExport(
             settings.Scope = scope;
             Exporter exporter = new Exporter();
             bool finished = false;
-            exporter.BatchExportFinished += (sender, args) => { finished = true; };
+            exporter.ProcessSucceeded += (sender, args) => { finished = true; };
             exporter.ExportBatchAsync(settings);
             Task checkFinishedTask = new Task(() =>
             {

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.25")]
-[assembly: AssemblyFileVersion("7.0.0.25")]
+[assembly: AssemblyVersion("7.0.0.26")]
+[assembly: AssemblyFileVersion("7.0.0.26")]

Tests/Tests.csproj

@@ -51,15 +51,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Debug %28Bovender via NuGet%29'">
-    <Reference Include="Bovender, Version=0.6.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.10.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.6.1.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.10.0.0\lib\net40\Bovender.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Release'">
-    <Reference Include="Bovender, Version=0.6.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.10.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.6.1.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.10.0.0\lib\net40\Bovender.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

Tests/packages.config

@@ -19,7 +19,7 @@
 	limitations under the License.
 -->
 <packages>
-  <package id="Bovender" version="0.6.1.0" targetFramework="net40" />
+  <package id="Bovender" version="0.10.0.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
   <package id="NLog" version="4.3.3" targetFramework="net40" />
   <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net40" />

VERSION

@@ -1,2 +1,2 @@
-7.0.0-beta.6
-7.0.0.25
+7.0.0-beta.7
+7.0.0.26

XLToolbox/About/AboutView.xaml

@@ -16,7 +16,7 @@
 	See the License for the specific language governing permissions and
 	limitations under the License.
 -->
-<Window x:Class="XLToolbox.About.AboutView"
+<Window x:Class="XLToolbox.About.AboutView" x:Name="About"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
@@ -34,6 +34,11 @@
         <ResourceDictionary Source="/Bovender;component/style.xaml" />
     </Window.Resources>
     <i:Interaction.Triggers>
+        <i:EventTrigger SourceName="About" EventName="MouseDown">
+            <i:EventTrigger.Actions>
+                <i:InvokeCommandAction Command="{Binding CloseViewCommand}" />
+            </i:EventTrigger.Actions>
+        </i:EventTrigger>
         <i:EventTrigger SourceObject="{Binding ShowLicenseMessage}" EventName="Sent">
             <i:EventTrigger.Actions>
                 <mvvm:ShowHtmlAction Caption="{x:Static l:Strings.License}"
@@ -68,6 +73,7 @@
                 <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>
+                <TextBlock TextAlignment="Center">NLog © Copyright Jaroslaw Kowalski, Kim Christensen, Julian Verdurmen</TextBlock>
                 <TextBlock TextAlignment="Center" Foreground="Red" FontWeight="Bold"
                            Text="{x:Static l:Strings.NoWarrantiesSeeLicense}" />
             </StackPanel>

XLToolbox/About/AboutView.xaml.cs

@@ -40,5 +40,10 @@ public AboutView()
         {
             InitializeComponent();
         }
+
+        private void Window_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+
+        }
     }
 }