diff --git a/Common/PdfScribeSharedAssemblyInfo.cs b/Common/PdfScribeSharedAssemblyInfo.cs new file mode 100644 index 0000000..511b2cc --- /dev/null +++ b/Common/PdfScribeSharedAssemblyInfo.cs @@ -0,0 +1,23 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyCompany("Black Telescope Workshop")] +[assembly: AssemblyProduct("PDF Scribe")] +[assembly: AssemblyCopyright("Copyright © S T Chan 2013")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +[assembly: AssemblyVersion("1.0.*")] +//[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/PdfScribe/PdfScribe.csproj b/PdfScribe/PdfScribe.csproj index 2c97ecf..60f61e6 100644 --- a/PdfScribe/PdfScribe.csproj +++ b/PdfScribe/PdfScribe.csproj @@ -89,6 +89,9 @@ + + PdfScribeSharedAssemblyInfo.cs + ActivityNotification.xaml diff --git a/PdfScribe/Properties/AssemblyInfo.cs b/PdfScribe/Properties/AssemblyInfo.cs index 28e35b9..d840ece 100644 --- a/PdfScribe/Properties/AssemblyInfo.cs +++ b/PdfScribe/Properties/AssemblyInfo.cs @@ -8,13 +8,8 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("PdfScribe")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("Postscript output redirector")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("PdfScribe")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from @@ -51,5 +46,5 @@ using System.Windows; // 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("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +//[assembly: AssemblyVersion("1.0.0.0")] +//[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/PdfScribeCore/NativeMethods.cs b/PdfScribeCore/NativeMethods.cs index 1df77f6..747b523 100644 --- a/PdfScribeCore/NativeMethods.cs +++ b/PdfScribeCore/NativeMethods.cs @@ -8,6 +8,7 @@ using System.Runtime.InteropServices; namespace PdfScribeCore { + #region Native Method Structures [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)] public struct MONITOR_INFO_2 @@ -97,6 +98,7 @@ namespace PdfScribeCore public uint cJobs; public uint AveragePPM; } + #endregion internal static class NativeMethods { diff --git a/PdfScribeCore/PdfScribeCore.csproj b/PdfScribeCore/PdfScribeCore.csproj index 3d3ed57..60e0037 100644 --- a/PdfScribeCore/PdfScribeCore.csproj +++ b/PdfScribeCore/PdfScribeCore.csproj @@ -90,6 +90,9 @@ + + PdfScribeSharedAssemblyInfo.cs + diff --git a/PdfScribeCore/Program.cs b/PdfScribeCore/Program.cs deleted file mode 100644 index 3225e12..0000000 --- a/PdfScribeCore/Program.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; - -namespace PdfScribe -{ - class Program - { - static void Main(string[] args) - { - //RemovePort(); - //RemovePortMonitor(); - //TestGetPorts(); - //AddPort(); - //TestGetPrinterDriverDir(); - //TestInstallPrinterDriver(); - DeletePdfScribePort(); - } - - public static void AddPort() - { - var installer = new PdfScribeInstaller(); - installer.AddPdfScribePortMonitor("SOFTSCAN", - "redmon64.dll", - @"C:\Code\PdfScribe\Lib\"); - } - - public static void DeletePdfScribePort() - { - var installer = new PdfScribeInstaller(); - installer.DeletePdfScribePort("SSCAN"); - } - - public static void RemovePortMonitor() - { - var installer = new PdfScribeInstaller(); - installer.RemoveSoftscanPortMonitor("SOFTSCAN"); - installer.RemoveSoftscanPortMonitor("OAISISSOFTSCAN"); - } - - public static void TestGetPorts() - { - var installer = new PdfScribeInstaller(); - List monList = installer.EnumerateMonitors(); - foreach (MONITOR_INFO_2 currentMonitor in monList) - { - Console.WriteLine(currentMonitor.pName + " / " + - currentMonitor.pEnvironment + " / " + - currentMonitor.pDLLName); - } - } - - public static void TestGetPrinterDriverDir() - { - var installer = new PdfScribeInstaller(); - String driverDir = installer.RetrievePrinterDriverDirectory(); - } - - public static void TestInstallPrinterDriver() - { - var installer = new PdfScribeInstaller(); - /*installer.AddSoftscanPortMonitor("OAISISSOFTSCAN", - "redmon64.dll", - @"C:\Code\OaisisRedmonInstaller\Lib\"); */ - installer.InstallSoftscanPrinter_Test(); - //installer.RemoveSoftscanPortMonitor("SOFTSCAN"); - - } - } -} diff --git a/PdfScribeCore/Properties/AssemblyInfo.cs b/PdfScribeCore/Properties/AssemblyInfo.cs index 65a6be4..4f61077 100644 --- a/PdfScribeCore/Properties/AssemblyInfo.cs +++ b/PdfScribeCore/Properties/AssemblyInfo.cs @@ -5,14 +5,9 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("PDF Scribe")] +[assembly: AssemblyTitle("PdfScribeCore")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("S T Chan")] -[assembly: AssemblyProduct("PDF Scribe")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from @@ -32,5 +27,5 @@ using System.Runtime.InteropServices; // 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("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +//[assembly: AssemblyVersion("1.0.0.0")] +//[assembly: AssemblyFileVersion("1.0.*")]