diff --git a/PDFWorkflowManager/.vs/PDFWorkflowManager/v16/.suo b/PDFWorkflowManager/.vs/PDFWorkflowManager/v16/.suo index 559ad29..688329b 100644 Binary files a/PDFWorkflowManager/.vs/PDFWorkflowManager/v16/.suo and b/PDFWorkflowManager/.vs/PDFWorkflowManager/v16/.suo differ diff --git a/PDFWorkflowManager/PDFWorkflowManager/MainForm.Designer.cs b/PDFWorkflowManager/PDFWorkflowManager/MainForm.Designer.cs index 2064afb..5c3a4a5 100644 --- a/PDFWorkflowManager/PDFWorkflowManager/MainForm.Designer.cs +++ b/PDFWorkflowManager/PDFWorkflowManager/MainForm.Designer.cs @@ -118,6 +118,7 @@ namespace PDFWorkflowManager this.txtPDFKeywords = new System.Windows.Forms.TextBox(); this.btnDisposePics = new System.Windows.Forms.Button(); this.btnDeleteTemp = new System.Windows.Forms.Button(); + this.btnDeleteCacheWork = new System.Windows.Forms.Button(); this.menuStrip1.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -1017,11 +1018,22 @@ namespace PDFWorkflowManager this.btnDeleteTemp.UseVisualStyleBackColor = true; this.btnDeleteTemp.Click += new System.EventHandler(this.button1_Click_1); // + // btnDeleteCacheWork + // + this.btnDeleteCacheWork.Location = new System.Drawing.Point(186, 970); + this.btnDeleteCacheWork.Name = "btnDeleteCacheWork"; + this.btnDeleteCacheWork.Size = new System.Drawing.Size(91, 35); + this.btnDeleteCacheWork.TabIndex = 58; + this.btnDeleteCacheWork.Text = "Clean Cache && Work"; + this.btnDeleteCacheWork.UseVisualStyleBackColor = true; + this.btnDeleteCacheWork.Click += new System.EventHandler(this.btnDeleteCacheWork_Click); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(983, 1040); + this.Controls.Add(this.btnDeleteCacheWork); this.Controls.Add(this.btnDeleteTemp); this.Controls.Add(this.btnDisposePics); this.Controls.Add(this.groupPDF); @@ -1160,6 +1172,7 @@ namespace PDFWorkflowManager private System.Windows.Forms.RadioButton radioSortFlatBed; private System.Windows.Forms.Button btnDisposePics; private System.Windows.Forms.Button btnDeleteTemp; + private System.Windows.Forms.Button btnDeleteCacheWork; } } diff --git a/PDFWorkflowManager/PDFWorkflowManager/MainForm.cs b/PDFWorkflowManager/PDFWorkflowManager/MainForm.cs index b3be478..f0032e5 100644 --- a/PDFWorkflowManager/PDFWorkflowManager/MainForm.cs +++ b/PDFWorkflowManager/PDFWorkflowManager/MainForm.cs @@ -901,7 +901,7 @@ namespace PDFWorkflowManager if (selectedValue != "eng") { - fileName += "_(" + languageCodes[cmbLanguage.Text] + ")" + $"[{cmbResolution.SelectedItem}dpi]"; + fileName += "_(" + languageCodes[cmbLanguage.Text] + ")" + $"[{cmbResolution.SelectedItem}dpi][ocr]"; } else { @@ -1152,7 +1152,30 @@ namespace PDFWorkflowManager private void button1_Click_1(object sender, EventArgs e) { - Directory.Delete(tempDir, true); + if (Directory.Exists(tempDir)) + { + Directory.Delete(tempDir, true); + } + } + + private void btnDeleteCacheWork_Click(object sender, EventArgs e) + { + if (Directory.Exists(workOutDir + "\\cache")) + { + Directory.Delete(workOutDir + "\\cache", true); + } + + + + if (Directory.Exists(workDir)) + { + DirectoryInfo di = new DirectoryInfo(workDir); + + foreach (FileInfo file in di.GetFiles()) + { + file.Delete(); + } + } } } } diff --git a/PDFWorkflowManager/PDFWorkflowManager/Properties/AssemblyInfo.cs b/PDFWorkflowManager/PDFWorkflowManager/Properties/AssemblyInfo.cs index c4921ad..547dba5 100644 --- a/PDFWorkflowManager/PDFWorkflowManager/Properties/AssemblyInfo.cs +++ b/PDFWorkflowManager/PDFWorkflowManager/Properties/AssemblyInfo.cs @@ -31,5 +31,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("0.9.1")] -[assembly: AssemblyFileVersion("0.9.1")] +[assembly: AssemblyVersion("0.9.2")] +[assembly: AssemblyFileVersion("0.9.2")] diff --git a/PDFWorkflowManager/Setup/Setup.vdproj b/PDFWorkflowManager/Setup/Setup.vdproj index 8b68930..62676fd 100644 --- a/PDFWorkflowManager/Setup/Setup.vdproj +++ b/PDFWorkflowManager/Setup/Setup.vdproj @@ -81,6 +81,12 @@ } "Entry" { + "MsmKey" = "8:_AD638FEF32314FB5B290D329BBB9B8B2" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_BB0FA39A7945BEFBE61386483941BF5F" "OwnerKey" = "8:_8578EF077D4242899B4A4FD7A981783D" "MsmSig" = "8:_UNDEFINED" @@ -201,7 +207,7 @@ "DisplayName" = "8:Debug" "IsDebugOnly" = "11:TRUE" "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:Debug\\Setup.msi" + "OutputFilename" = "8:Debug\\Setup Debug.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -233,7 +239,7 @@ "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:Release\\Setup.msi" + "OutputFilename" = "8:Release\\PDF Workflow Manager Beta 0.9.2 x64.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -514,6 +520,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AD638FEF32314FB5B290D329BBB9B8B2" + { + "SourcePath" = "8:..\\packages\\Magick.NET-Q8-AnyCPU.12.3.0\\runtimes\\win-x64\\native\\Magick.Native-Q8-x64.dll" + "TargetName" = "8:Magick.Native-Q8-x64.dll" + "Tag" = "8:" + "Folder" = "8:_57C38B4AD77E4684A6778961737DF789" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BB0FA39A7945BEFBE61386483941BF5F" { "AssemblyRegister" = "3:1" @@ -745,15 +771,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:PDF Workflow Manager" - "ProductCode" = "8:{BDDC90F3-3D35-491E-87EA-F38871BDE8F6}" - "PackageCode" = "8:{361DB168-2F68-49B6-9BDC-DA5D6FC4AC97}" + "ProductCode" = "8:{6DA56E05-8CBF-4AC9-AF23-3EBC2133CEF1}" + "PackageCode" = "8:{77D63DCE-540C-4615-8F85-7F0E03550102}" "UpgradeCode" = "8:{E8BFFB6D-3BA8-4AD3-B0EE-C2D0347636B7}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:0.9.1" + "ProductVersion" = "8:0.9.2" "Manufacturer" = "8:Retro Commodore" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:"