diff --git a/Lib/nunit-console-runner.dll b/Lib/nunit-console-runner.dll deleted file mode 100644 index a2a21ce..0000000 Binary files a/Lib/nunit-console-runner.dll and /dev/null differ diff --git a/Lib/nunit.core.dll b/Lib/nunit.core.dll deleted file mode 100644 index b306fae..0000000 Binary files a/Lib/nunit.core.dll and /dev/null differ diff --git a/Lib/nunit.core.interfaces.dll b/Lib/nunit.core.interfaces.dll deleted file mode 100644 index 4053b0d..0000000 Binary files a/Lib/nunit.core.interfaces.dll and /dev/null differ diff --git a/Lib/nunit.framework.dll b/Lib/nunit.framework.dll deleted file mode 100644 index 780727f..0000000 Binary files a/Lib/nunit.framework.dll and /dev/null differ diff --git a/Lib/nunit.util.dll b/Lib/nunit.util.dll deleted file mode 100644 index 122eff4..0000000 Binary files a/Lib/nunit.util.dll and /dev/null differ diff --git a/PdfScribe.sln b/PdfScribe.sln index 63a7b4d..46bb462 100644 --- a/PdfScribe.sln +++ b/PdfScribe.sln @@ -1,92 +1,91 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2027 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfScribeCore", "PdfScribeCore\PdfScribeCore.csproj", "{1EAD8E9A-A123-4C37-B31E-AEE1354DF003}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfScribe", "PdfScribe\PdfScribe.csproj", "{09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfScribeInstallCustomAction", "PdfScribeInstallCustomAction\PdfScribeInstallCustomAction.csproj", "{E8679E1B-8C89-4201-97D5-7E43C5A486C9}" -EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "PdfScribeInstall", "PdfScribeInstall\PdfScribeInstall.wixproj", "{3C255536-A7F1-4913-9C7F-966DFFEE01BC}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfScribeTests", "PdfScribeTests\PdfScribeTests.csproj", "{8562A5BC-A70E-40DD-A7E7-5611D332A983}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Debug|x64.ActiveCfg = Debug|x64 - {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Debug|x64.Build.0 = Debug|x64 - {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Debug|x86.ActiveCfg = Debug|x86 - {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Debug|x86.Build.0 = Debug|x86 - {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Release|Any CPU.ActiveCfg = Release|x64 - {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Release|Any CPU.Build.0 = Release|x64 - {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Release|x64.ActiveCfg = Release|x64 - {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Release|x64.Build.0 = Release|x64 - {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Release|x86.ActiveCfg = Release|x86 - {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Release|x86.Build.0 = Release|x86 - {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Debug|x64.ActiveCfg = Debug|x64 - {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Debug|x64.Build.0 = Debug|x64 - {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Debug|x86.ActiveCfg = Debug|x86 - {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Debug|x86.Build.0 = Debug|x86 - {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Release|Any CPU.ActiveCfg = Release|x64 - {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Release|Any CPU.Build.0 = Release|x64 - {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Release|x64.ActiveCfg = Release|x64 - {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Release|x64.Build.0 = Release|x64 - {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Release|x86.ActiveCfg = Release|x86 - {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Release|x86.Build.0 = Release|x86 - {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Debug|x64.ActiveCfg = Debug|x64 - {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Debug|x64.Build.0 = Debug|x64 - {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Debug|x86.ActiveCfg = Debug|x86 - {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Debug|x86.Build.0 = Debug|x86 - {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Release|Any CPU.ActiveCfg = Release|x64 - {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Release|Any CPU.Build.0 = Release|x64 - {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Release|x64.ActiveCfg = Release|x64 - {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Release|x64.Build.0 = Release|x64 - {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Release|x86.ActiveCfg = Release|x86 - {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Release|x86.Build.0 = Release|x86 - {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|Any CPU.ActiveCfg = Debug|x86 - {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|x64.ActiveCfg = Debug|x64 - {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|x64.Build.0 = Debug|x64 - {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|x86.ActiveCfg = Debug|x86 - {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|x86.Build.0 = Debug|x86 - {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|Any CPU.ActiveCfg = Release|x64 - {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|Any CPU.Build.0 = Release|x64 - {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|x64.ActiveCfg = Release|x64 - {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|x64.Build.0 = Release|x64 - {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|x86.ActiveCfg = Release|x86 - {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|x86.Build.0 = Release|x86 - {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Debug|x64.ActiveCfg = Debug|Any CPU - {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Debug|x64.Build.0 = Debug|Any CPU - {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Debug|x86.ActiveCfg = Debug|Any CPU - {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Debug|x86.Build.0 = Debug|Any CPU - {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Release|Any CPU.Build.0 = Release|Any CPU - {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Release|x64.ActiveCfg = Release|Any CPU - {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Release|x64.Build.0 = Release|Any CPU - {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Release|x86.ActiveCfg = Release|Any CPU - {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {3B5FB176-0EF6-421E-BF33-18A488C9C089} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2027 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfScribeCore", "PdfScribeCore\PdfScribeCore.csproj", "{1EAD8E9A-A123-4C37-B31E-AEE1354DF003}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfScribe", "PdfScribe\PdfScribe.csproj", "{09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfScribeInstallCustomAction", "PdfScribeInstallCustomAction\PdfScribeInstallCustomAction.csproj", "{E8679E1B-8C89-4201-97D5-7E43C5A486C9}" +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "PdfScribeInstall", "PdfScribeInstall\PdfScribeInstall.wixproj", "{3C255536-A7F1-4913-9C7F-966DFFEE01BC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfScribeTests", "PdfScribeTests\PdfScribeTests.csproj", "{8562A5BC-A70E-40DD-A7E7-5611D332A983}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Debug|x64.ActiveCfg = Debug|x64 + {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Debug|x64.Build.0 = Debug|x64 + {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Debug|x86.ActiveCfg = Debug|x86 + {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Debug|x86.Build.0 = Debug|x86 + {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Release|Any CPU.ActiveCfg = Release|x64 + {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Release|Any CPU.Build.0 = Release|x64 + {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Release|x64.ActiveCfg = Release|x64 + {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Release|x64.Build.0 = Release|x64 + {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Release|x86.ActiveCfg = Release|x86 + {1EAD8E9A-A123-4C37-B31E-AEE1354DF003}.Release|x86.Build.0 = Release|x86 + {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Debug|x64.ActiveCfg = Debug|x64 + {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Debug|x64.Build.0 = Debug|x64 + {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Debug|x86.ActiveCfg = Debug|x86 + {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Debug|x86.Build.0 = Debug|x86 + {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Release|Any CPU.ActiveCfg = Release|x64 + {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Release|Any CPU.Build.0 = Release|x64 + {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Release|x64.ActiveCfg = Release|x64 + {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Release|x64.Build.0 = Release|x64 + {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Release|x86.ActiveCfg = Release|x86 + {09BB3AA3-96D3-4BA1-BCB3-4E17067F42B2}.Release|x86.Build.0 = Release|x86 + {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Debug|x64.ActiveCfg = Debug|x64 + {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Debug|x64.Build.0 = Debug|x64 + {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Debug|x86.ActiveCfg = Debug|x86 + {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Debug|x86.Build.0 = Debug|x86 + {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Release|Any CPU.ActiveCfg = Release|x64 + {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Release|Any CPU.Build.0 = Release|x64 + {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Release|x64.ActiveCfg = Release|x64 + {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Release|x64.Build.0 = Release|x64 + {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Release|x86.ActiveCfg = Release|x86 + {E8679E1B-8C89-4201-97D5-7E43C5A486C9}.Release|x86.Build.0 = Release|x86 + {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|Any CPU.ActiveCfg = Debug|x86 + {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|x64.ActiveCfg = Debug|x64 + {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|x64.Build.0 = Debug|x64 + {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|x86.ActiveCfg = Debug|x86 + {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Debug|x86.Build.0 = Debug|x86 + {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|Any CPU.ActiveCfg = Release|x64 + {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|Any CPU.Build.0 = Release|x64 + {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|x64.ActiveCfg = Release|x64 + {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|x64.Build.0 = Release|x64 + {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|x86.ActiveCfg = Release|x86 + {3C255536-A7F1-4913-9C7F-966DFFEE01BC}.Release|x86.Build.0 = Release|x86 + {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Debug|x64.ActiveCfg = Debug|Any CPU + {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Debug|x64.Build.0 = Debug|Any CPU + {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Debug|x86.ActiveCfg = Debug|Any CPU + {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Debug|x86.Build.0 = Debug|Any CPU + {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Release|x64.ActiveCfg = Release|Any CPU + {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Release|x64.Build.0 = Release|Any CPU + {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Release|x86.ActiveCfg = Release|Any CPU + {8562A5BC-A70E-40DD-A7E7-5611D332A983}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3B5FB176-0EF6-421E-BF33-18A488C9C089} + EndGlobalSection +EndGlobal diff --git a/PdfScribeCore/ErrorDialogPresenter.cs b/PdfScribeCore/ErrorDialogPresenter.cs deleted file mode 100644 index a8f1b9e..0000000 --- a/PdfScribeCore/ErrorDialogPresenter.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows; - -using APICodePack = Microsoft.WindowsAPICodePack.Dialogs; - -namespace PdfScribeCore -{ - public class ErrorDialogPresenter : TaskDialogPresenter - { - protected override APICodePack.TaskDialogStandardIcon DefaultTaskIcon - { - get { return APICodePack.TaskDialogStandardIcon.Error; } - } - - public ErrorDialogPresenter() - : base() - { - - } - - /// - /// Ctor that shows the - /// task dialog immediately - /// - /// Text that goes in the window caption - /// Instructional text (Appears next to the icon) - /// Smaller message detail text at bottom - public ErrorDialogPresenter(String captionText, - String instructionText, - String messageText) : - base(captionText, instructionText, messageText) - { - } - - - - } -} diff --git a/PdfScribeCore/TaskDialogPresenter.cs b/PdfScribeCore/TaskDialogPresenter.cs deleted file mode 100644 index 0866d0e..0000000 --- a/PdfScribeCore/TaskDialogPresenter.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows; - -using APICodePack = Microsoft.WindowsAPICodePack.Dialogs; - -namespace PdfScribeCore -{ - public abstract class TaskDialogPresenter - { - - protected abstract APICodePack.TaskDialogStandardIcon DefaultTaskIcon { get; } // Override this to set the dialog icon you want - - - public TaskDialogPresenter() - { } - - /// - /// Ctor that shows the - /// task dialog immediately - /// - /// Text that goes in the window caption - /// Instructional text (Appears next to the icon) - /// Smaller message detail text at bottom - public TaskDialogPresenter(String captionText, - String instructionText, - String messageText) - { - ShowSimple(captionText, instructionText, messageText); - } - - /// - /// Pops up a simple TaskDialog box - /// with just a Close button and - /// the default standard dialog icon - /// - /// Text that goes in the window's caption - /// Instructional text (Appears next to the error icon) - /// Smaller message detail text at bottom - public virtual void ShowSimple(String captionText, - String instructionText, - String messageText) - { - using (APICodePack.TaskDialog simpleTaskDialog = new APICodePack.TaskDialog()) - { - simpleTaskDialog.Caption = captionText; - simpleTaskDialog.InstructionText = instructionText; - simpleTaskDialog.Text = messageText; - simpleTaskDialog.Icon = this.DefaultTaskIcon; - simpleTaskDialog.StandardButtons = APICodePack.TaskDialogStandardButtons.Close; - simpleTaskDialog.Opened += new EventHandler(simpleTaskDialog_Opened); - simpleTaskDialog.StartupLocation = APICodePack.TaskDialogStartupLocation.CenterScreen; - simpleTaskDialog.Show(); - } - } - - private void simpleTaskDialog_Opened(object sender, EventArgs e) - { - // Really fucking annoying - - // There's a bug somewhere in the API Code Pack that - // causes the icon not to show - // unless you set it on the Opened event - // See: http://stackoverflow.com/questions/15645592/taskdialogstandardicon-not-working-on-task-dialog - // One of these days I'll try to find and fix it (honestly I hope - // someone else fixes first - also why isn't the API Code pack on codeplex - // or github so people can push patches), but until then... - ((APICodePack.TaskDialog)sender).Icon = this.DefaultTaskIcon; - - } - - } -} diff --git a/PdfScribeCore/app.manifest b/PdfScribeCore/app.manifest deleted file mode 100644 index 9e0556d..0000000 --- a/PdfScribeCore/app.manifest +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -