possible fix bug that magazines only can output to jpg once
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -5,3 +5,4 @@ PDFWorkflowManager/Setup/Debug
|
|||||||
PDFWorkflowManager/Setup/Release
|
PDFWorkflowManager/Setup/Release
|
||||||
/PDFWorkflowManager/.vs
|
/PDFWorkflowManager/.vs
|
||||||
/PDFWorkflowManager/_.vs
|
/PDFWorkflowManager/_.vs
|
||||||
|
/PDFWorkflowManager/Setup/obj
|
||||||
|
@@ -1,34 +1,56 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 16
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 16.0.33214.272
|
VisualStudioVersion = 17.14.36414.22
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PDF Workflow Manager", "PDFWorkflowManager\PDF Workflow Manager.csproj", "{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PDF Workflow Manager", "PDFWorkflowManager\PDF Workflow Manager.csproj", "{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{E4C5F971-3D5B-4645-98E7-2737AE92E82A}"
|
Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "Setup", "Setup\Setup.wixproj", "{47F764FC-DE98-4529-9644-412B7636AD30}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Debug|ARM64 = Debug|ARM64
|
||||||
Debug|x64 = Debug|x64
|
Debug|x64 = Debug|x64
|
||||||
|
Debug|x86 = Debug|x86
|
||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
|
Release|ARM64 = Release|ARM64
|
||||||
Release|x64 = Release|x64
|
Release|x64 = Release|x64
|
||||||
|
Release|x86 = Release|x86
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||||
|
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||||
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Debug|x64.ActiveCfg = Debug|x64
|
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Debug|x64.Build.0 = Debug|x64
|
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Release|Any CPU.Build.0 = Release|Any CPU
|
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||||
|
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Release|ARM64.Build.0 = Release|Any CPU
|
||||||
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Release|x64.ActiveCfg = Release|x64
|
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Release|x64.ActiveCfg = Release|x64
|
||||||
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Release|x64.Build.0 = Release|x64
|
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Release|x64.Build.0 = Release|x64
|
||||||
{E4C5F971-3D5B-4645-98E7-2737AE92E82A}.Debug|Any CPU.ActiveCfg = Debug
|
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{E4C5F971-3D5B-4645-98E7-2737AE92E82A}.Debug|x64.ActiveCfg = Debug
|
{1957F2AD-ACB5-4938-B2BA-3D2C365BBAF6}.Release|x86.Build.0 = Release|Any CPU
|
||||||
{E4C5F971-3D5B-4645-98E7-2737AE92E82A}.Debug|x64.Build.0 = Debug
|
{47F764FC-DE98-4529-9644-412B7636AD30}.Debug|Any CPU.ActiveCfg = Debug|x64
|
||||||
{E4C5F971-3D5B-4645-98E7-2737AE92E82A}.Release|Any CPU.ActiveCfg = Release
|
{47F764FC-DE98-4529-9644-412B7636AD30}.Debug|Any CPU.Build.0 = Debug|x64
|
||||||
{E4C5F971-3D5B-4645-98E7-2737AE92E82A}.Release|x64.ActiveCfg = Release
|
{47F764FC-DE98-4529-9644-412B7636AD30}.Debug|ARM64.ActiveCfg = Debug|ARM64
|
||||||
{E4C5F971-3D5B-4645-98E7-2737AE92E82A}.Release|x64.Build.0 = Release
|
{47F764FC-DE98-4529-9644-412B7636AD30}.Debug|ARM64.Build.0 = Debug|ARM64
|
||||||
|
{47F764FC-DE98-4529-9644-412B7636AD30}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{47F764FC-DE98-4529-9644-412B7636AD30}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{47F764FC-DE98-4529-9644-412B7636AD30}.Debug|x86.ActiveCfg = Debug|x86
|
||||||
|
{47F764FC-DE98-4529-9644-412B7636AD30}.Debug|x86.Build.0 = Debug|x86
|
||||||
|
{47F764FC-DE98-4529-9644-412B7636AD30}.Release|Any CPU.ActiveCfg = Release|x64
|
||||||
|
{47F764FC-DE98-4529-9644-412B7636AD30}.Release|Any CPU.Build.0 = Release|x64
|
||||||
|
{47F764FC-DE98-4529-9644-412B7636AD30}.Release|ARM64.ActiveCfg = Release|ARM64
|
||||||
|
{47F764FC-DE98-4529-9644-412B7636AD30}.Release|ARM64.Build.0 = Release|ARM64
|
||||||
|
{47F764FC-DE98-4529-9644-412B7636AD30}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{47F764FC-DE98-4529-9644-412B7636AD30}.Release|x64.Build.0 = Release|x64
|
||||||
|
{47F764FC-DE98-4529-9644-412B7636AD30}.Release|x86.ActiveCfg = Release|x86
|
||||||
|
{47F764FC-DE98-4529-9644-412B7636AD30}.Release|x86.Build.0 = Release|x86
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
@@ -31,8 +31,9 @@
|
|||||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
|
||||||
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
|
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
|
||||||
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
|
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
|
||||||
|
this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
|
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
|
||||||
this.quitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.quitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
@@ -123,7 +124,6 @@
|
|||||||
this.btnDisposePics = new System.Windows.Forms.Button();
|
this.btnDisposePics = new System.Windows.Forms.Button();
|
||||||
this.btnDeleteTemp = new System.Windows.Forms.Button();
|
this.btnDeleteTemp = new System.Windows.Forms.Button();
|
||||||
this.btnDeleteCacheWork = new System.Windows.Forms.Button();
|
this.btnDeleteCacheWork = new System.Windows.Forms.Button();
|
||||||
this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
|
||||||
this.menuStrip1.SuspendLayout();
|
this.menuStrip1.SuspendLayout();
|
||||||
this.groupBox1.SuspendLayout();
|
this.groupBox1.SuspendLayout();
|
||||||
this.groupBox2.SuspendLayout();
|
this.groupBox2.SuspendLayout();
|
||||||
@@ -170,34 +170,41 @@
|
|||||||
this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
|
this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
|
||||||
this.fileToolStripMenuItem.Text = "&File";
|
this.fileToolStripMenuItem.Text = "&File";
|
||||||
//
|
//
|
||||||
// loadToolStripMenuItem
|
// newToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.loadToolStripMenuItem.Name = "loadToolStripMenuItem";
|
this.newToolStripMenuItem.Name = "newToolStripMenuItem";
|
||||||
this.loadToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
this.newToolStripMenuItem.Size = new System.Drawing.Size(109, 22);
|
||||||
this.loadToolStripMenuItem.Text = "&Load...";
|
this.newToolStripMenuItem.Text = "&New";
|
||||||
this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click);
|
this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// toolStripSeparator1
|
// toolStripSeparator1
|
||||||
//
|
//
|
||||||
this.toolStripSeparator1.Name = "toolStripSeparator1";
|
this.toolStripSeparator1.Name = "toolStripSeparator1";
|
||||||
this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
|
this.toolStripSeparator1.Size = new System.Drawing.Size(106, 6);
|
||||||
|
//
|
||||||
|
// loadToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.loadToolStripMenuItem.Name = "loadToolStripMenuItem";
|
||||||
|
this.loadToolStripMenuItem.Size = new System.Drawing.Size(109, 22);
|
||||||
|
this.loadToolStripMenuItem.Text = "&Load...";
|
||||||
|
this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// saveToolStripMenuItem
|
// saveToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
|
this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
|
||||||
this.saveToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
this.saveToolStripMenuItem.Size = new System.Drawing.Size(109, 22);
|
||||||
this.saveToolStripMenuItem.Text = "&Save...";
|
this.saveToolStripMenuItem.Text = "&Save...";
|
||||||
this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
|
this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// toolStripSeparator2
|
// toolStripSeparator2
|
||||||
//
|
//
|
||||||
this.toolStripSeparator2.Name = "toolStripSeparator2";
|
this.toolStripSeparator2.Name = "toolStripSeparator2";
|
||||||
this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);
|
this.toolStripSeparator2.Size = new System.Drawing.Size(106, 6);
|
||||||
//
|
//
|
||||||
// quitToolStripMenuItem
|
// quitToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.quitToolStripMenuItem.Name = "quitToolStripMenuItem";
|
this.quitToolStripMenuItem.Name = "quitToolStripMenuItem";
|
||||||
this.quitToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
this.quitToolStripMenuItem.Size = new System.Drawing.Size(109, 22);
|
||||||
this.quitToolStripMenuItem.Text = "&Quit";
|
this.quitToolStripMenuItem.Text = "&Quit";
|
||||||
this.quitToolStripMenuItem.Click += new System.EventHandler(this.quitToolStripMenuItem_Click);
|
this.quitToolStripMenuItem.Click += new System.EventHandler(this.quitToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
@@ -1074,13 +1081,6 @@
|
|||||||
this.btnDeleteCacheWork.UseVisualStyleBackColor = true;
|
this.btnDeleteCacheWork.UseVisualStyleBackColor = true;
|
||||||
this.btnDeleteCacheWork.Click += new System.EventHandler(this.btnDeleteCacheWork_Click);
|
this.btnDeleteCacheWork.Click += new System.EventHandler(this.btnDeleteCacheWork_Click);
|
||||||
//
|
//
|
||||||
// newToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.newToolStripMenuItem.Name = "newToolStripMenuItem";
|
|
||||||
this.newToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
|
||||||
this.newToolStripMenuItem.Text = "&New";
|
|
||||||
this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// MainForm
|
// MainForm
|
||||||
//
|
//
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||||
|
@@ -899,9 +899,11 @@ namespace PDFWorkflowManager
|
|||||||
|
|
||||||
btnMakePDF.Enabled = true;
|
btnMakePDF.Enabled = true;
|
||||||
toolStripStatusLabel1.Text = "Converting files to pdf. Done!";
|
toolStripStatusLabel1.Text = "Converting files to pdf. Done!";
|
||||||
|
strExtension = "tif"; // reset to tiff extension
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
|
strExtension = "tif"; // reset to tiff extension
|
||||||
MessageBox.Show("No supported files in Work\\out directory!", "No supported files found!", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
MessageBox.Show("No supported files in Work\\out directory!", "No supported files found!", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
13
PDFWorkflowManager/Setup/Bundle.wxs
Normal file
13
PDFWorkflowManager/Setup/Bundle.wxs
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
|
||||||
|
<Bundle Id="TODO_Manufacturer.Setup" Name="Setup" Manufacturer="TODO Manufacturer" Version="1.0.0.0">
|
||||||
|
<BootstrapperApplication>
|
||||||
|
<bal:WixStandardBootstrapperApplication LicenseUrl="https://www.example.com/license" Theme="hyperlinkLicense" />
|
||||||
|
</BootstrapperApplication>
|
||||||
|
|
||||||
|
<Chain>
|
||||||
|
<!-- TODO: Define the list of chained packages. -->
|
||||||
|
<!-- <MsiPackage SourceFile="path\to\your.msi" /> -->
|
||||||
|
</Chain>
|
||||||
|
|
||||||
|
</Bundle>
|
||||||
|
</Wix>
|
File diff suppressed because it is too large
Load Diff
9
PDFWorkflowManager/Setup/Setup.wixproj
Normal file
9
PDFWorkflowManager/Setup/Setup.wixproj
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
<Project Sdk="WixToolset.Sdk/6.0.1">
|
||||||
|
<PropertyGroup>
|
||||||
|
<OutputType>Bundle</OutputType>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="WixToolset.BootstrapperApplications.wixext" Version="6.0.1" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
Reference in New Issue
Block a user