diff --git a/PDFWorkflowManager/PDFWorkflowManager/MainForm.cs b/PDFWorkflowManager/PDFWorkflowManager/MainForm.cs index a05ad9d..7ff49c1 100644 --- a/PDFWorkflowManager/PDFWorkflowManager/MainForm.cs +++ b/PDFWorkflowManager/PDFWorkflowManager/MainForm.cs @@ -791,6 +791,7 @@ namespace PDFWorkflowManager } */ } + private async Task prepConvertToTempOutdir(string[] strFiles) { try @@ -807,32 +808,25 @@ namespace PDFWorkflowManager toolStripProgressBar1.Value = 0; toolStripStatusLabel1.Text = "Converting files to jpg."; - List tasks = new List(); - + // Convert to jpg 300 DPI await Task.Run(() => { - Parallel.ForEach(strFiles, async inputFile => + Parallel.ForEach(strFiles, inputFile => { outputFile = Path.Combine(tempJpg300Dir, Path.GetFileNameWithoutExtension(inputFile) + ".jpg"); convertToJpeg(inputFile, outputFile, 85, 300); - - //Interlocked.Increment(ref toolStripProgressBar1.Value); - //UpdateProgressBar(); }); }); + // Convert to jpg 150 DPI await Task.Run(() => { - Parallel.ForEach(strFiles, async inputFile => + Parallel.ForEach(strFiles, inputFile => { outputFile = Path.Combine(tempJpg150Dir, Path.GetFileNameWithoutExtension(inputFile) + ".jpg"); convertToJpeg(inputFile, outputFile, 85, 150); - - //Interlocked.Increment(ref toolStripProgressBar1.Value); - //UpdateProgressBar(); }); }); - await Task.WhenAll(tasks); } finally { @@ -854,6 +848,7 @@ namespace PDFWorkflowManager toolStripProgressBar1.Value++; } } + private async void btnConvertToPDF_Click(object sender, EventArgs e) { try @@ -1484,7 +1479,7 @@ namespace PDFWorkflowManager txtProjectDir.Text = dict.ContainsKey("ProjectDir") ? dict["ProjectDir"] : ""; // MessageBox.Show("Loaded file: " + loadedProjectFilePath, "File Loaded", MessageBoxButtons.OK, MessageBoxIcon.Information); - toolStripStatusLabel1.Text = "Project file loaded: "; + toolStripStatusLabel1.Text = "Project file loaded."; } } }