From 55c5e9aeec73b1b94d28fd0648dd545ef4ef587d Mon Sep 17 00:00:00 2001
From: S T Chan <sherman.chan@pobox.com>
Date: Thu, 9 Jan 2014 11:12:37 -0500
Subject: [PATCH] periodic commit

---
 PdfScribe/ActivityNotification.xaml        |  2 +-
 PdfScribe/ActivityNotificationPresenter.cs | 41 ++++++++++++++--------
 PdfScribe/Program.cs                       | 21 +++++++++--
 PdfScribeCore/TaskDialogPresenter.cs       |  1 +
 4 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/PdfScribe/ActivityNotification.xaml b/PdfScribe/ActivityNotification.xaml
index eb918a4..623b01b 100644
--- a/PdfScribe/ActivityNotification.xaml
+++ b/PdfScribe/ActivityNotification.xaml
@@ -7,7 +7,7 @@
         WindowStyle="None"
         Background="Transparent"
         WindowStartupLocation="CenterScreen"
-        Topmost="True">
+        Topmost="True" ShowInTaskbar="False">
     <Grid>
         <Image Name="QuillPenBackground" Source="Adobe_CreatePDF_icon.PNG" HorizontalAlignment="Center" VerticalAlignment="Top" Height="200" Width="200"  ></Image>
         <Label Height="29" HorizontalAlignment="Left" Margin="12,203,0,0" Name="labelProgress" VerticalAlignment="Top" Width="254" Foreground="Red" FontFamily="Arial Rounded MT" FontSize="16" HorizontalContentAlignment="Center" FontWeight="Bold" VerticalContentAlignment="Top" Content="CAPTURING" />
diff --git a/PdfScribe/ActivityNotificationPresenter.cs b/PdfScribe/ActivityNotificationPresenter.cs
index c61ffc1..8300d6b 100644
--- a/PdfScribe/ActivityNotificationPresenter.cs
+++ b/PdfScribe/ActivityNotificationPresenter.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -14,11 +15,11 @@ namespace PdfScribe
         public ActivityNotificationPresenter(Application guiApplication)
         {
             this.activityWindowApp = guiApplication;
+            this.activityWindow = new ActivityNotification();
             this.progressTimer = new SysTimers.Timer();
             this.progressTimer.Enabled = false;
             this.progressTimer.Interval = 250; // Quarter second is default
             this.progressTimer.Elapsed += new SysTimers.ElapsedEventHandler(progressTimer_Elapsed);
-            this.activityWindow = new ActivityNotification();
             /*
             if (guiApplication.Dispatcher.CheckAccess())
             {
@@ -29,22 +30,26 @@ namespace PdfScribe
                 guiApplication.Dispatcher.Invoke((Action)delegate()
                                                     {
                                                         this.activityWindow = new ActivityNotification();
-                                                        progressTimer = new SysTimers.Timer();
-                                                        progressTimer.Enabled = false;
-                                                        progressTimer.Interval = 250; // Quarter second is default
-                                                        progressTimer.Elapsed += new SysTimers.ElapsedEventHandler(progressTimer_Elapsed);
                                                     }
                                                 );
             }
              */ 
         }
 
+        public ActivityNotificationPresenter()
+        {
+            this.progressTimer = new SysTimers.Timer();
+            this.progressTimer.Enabled = false;
+            this.progressTimer.Interval = 250; // Quarter second is default
+            this.progressTimer.Elapsed += new SysTimers.ElapsedEventHandler(progressTimer_Elapsed);
+            this.activityWindow = new ActivityNotification();
+        }
 
         
         private Application activityWindowApp;
         private ActivityNotification activityWindow = null;
         private SysTimers.Timer progressTimer;
-        readonly String progressString = "CAPTURING";
+        private readonly String progressString = "CAPTURING";
 
         /// <summary>
         /// Displays the floating frameless
@@ -55,19 +60,21 @@ namespace PdfScribe
         {
             if (this.activityWindow != null)
             {
+
                 if (this.activityWindow.Dispatcher.CheckAccess())
                 {
                     this.activityWindow.Show();
+                    this.progressTimer.Start();
                 }
                 else
                 {
                     this.activityWindow.Dispatcher.Invoke((Action)delegate()
                                                                 {
                                                                     this.activityWindow.Show();
+                                                                    this.progressTimer.Start();
                                                                 }
-                                                             );
+                                                                );
                 }
-                this.progressTimer.Start();
             }
         }
         
@@ -97,7 +104,8 @@ namespace PdfScribe
         /// </summary>
         public void CloseActivityNotificationWindow()
         {
-            this.progressTimer.Enabled = false;
+            //this.progressTimer.Elapsed -= new SysTimers.ElapsedEventHandler(progressTimer_Elapsed);
+            this.progressTimer.Stop();
             if (this.activityWindow != null)
             {
                 if (this.activityWindow.Dispatcher.CheckAccess())
@@ -114,7 +122,6 @@ namespace PdfScribe
                 }
                 this.activityWindow = null;
             }
-
             /*
             if (activityWindowApp != null)
             {
@@ -139,9 +146,10 @@ namespace PdfScribe
 
 
         private int progressCounter = 0;
+        static Object timerElapsedLock = new Object();
         private void progressTimer_Elapsed(object sender, SysTimers.ElapsedEventArgs e)
         {
-            ((SysTimers.Timer)sender).Enabled = false;
+            ((SysTimers.Timer)sender).Stop();
             if (activityWindow != null)
             {
                 if (this.progressCounter >= progressString.Length)
@@ -149,19 +157,22 @@ namespace PdfScribe
 
                 if (activityWindow.labelProgress.Dispatcher.CheckAccess())
                 {
-                    activityWindow.labelProgress.Content = progressString.Substring(0, progressCounter + 1);
+                    EventLog.WriteEntry("PdfScribe", "Timer_No_Invoke");
+                    this.activityWindow.labelProgress.Content = this.progressString.Substring(0, progressCounter + 1);
                 }
                 else
                 {
-                    activityWindow.labelProgress.Dispatcher.Invoke((Action)delegate()
+                    EventLog.WriteEntry("PdfScribe", "Timer_Invoke");
+                    this.activityWindow.labelProgress.Dispatcher.BeginInvoke((Action)delegate()
                                                                         {
-                                                                            activityWindow.labelProgress.Content = progressString.Substring(0, progressCounter + 1);
+                                                                            this.activityWindow.labelProgress.Content = this.progressString.Substring(0, progressCounter + 1);
                                                                         }
                                                                     );
+                    EventLog.WriteEntry("PdfScribe", "Timer_Invoked");
                 }
                 progressCounter++;
-                ((SysTimers.Timer)sender).Enabled = true;
             }
+            ((SysTimers.Timer)sender).Start();
         }
 
     }
diff --git a/PdfScribe/Program.cs b/PdfScribe/Program.cs
index 238fc71..41721fa 100644
--- a/PdfScribe/Program.cs
+++ b/PdfScribe/Program.cs
@@ -54,7 +54,8 @@ namespace PdfScribe
             LaunchApplication();
             userDisplay = new ActivityNotificationPresenter(guiApplication);
             userDisplay.ShowActivityNotificationWindow();
-            //Thread.Sleep(20000);
+            Thread.Sleep(10000);
+            //LaunchActivityNotification();
 
             String standardInputFilename = Path.GetTempFileName();
             String outputFilename = Path.Combine(Path.GetTempPath(), defaultOutputFilename);
@@ -131,7 +132,7 @@ namespace PdfScribe
                                               (int)TraceEventType.Warning,
                                               String.Format(warnFileNotDeleted, standardInputFilename));
                 }
-                userDisplay.CloseActivityNotificationWindow();
+                if (userDisplay != null) userDisplay.CloseActivityNotificationWindow();
                 ShutdownApplication();
             }
         }
@@ -157,6 +158,19 @@ namespace PdfScribe
                                                                         ((Exception)e.ExceptionObject).StackTrace);
         }
 
+        static void LaunchActivityNotification()
+        {
+            if (guiApplication != null)
+            {
+                guiApplication.Dispatcher.Invoke((Action)delegate()
+                    {
+                        ActivityNotificationPresenter notificationPresenter = new ActivityNotificationPresenter();
+                        notificationPresenter.ShowActivityNotificationWindow();
+                    }
+                );
+            }
+        }
+
         static void LaunchApplication()
         {
 
@@ -170,6 +184,7 @@ namespace PdfScribe
                                 }
                             ));
                 guiApplicationThread.SetApartmentState(ApartmentState.STA);
+                guiApplicationThread.IsBackground = true;
                 guiApplicationThread.Start();
             }
         }
@@ -191,7 +206,7 @@ namespace PdfScribe
                     }
                 );
                 guiApplication.Dispatcher.InvokeShutdown();
-                guiApplication = null;
+                //guiApplication.Shutdown();
             }
         }
     }
diff --git a/PdfScribeCore/TaskDialogPresenter.cs b/PdfScribeCore/TaskDialogPresenter.cs
index dbe758c..0a69424 100644
--- a/PdfScribeCore/TaskDialogPresenter.cs
+++ b/PdfScribeCore/TaskDialogPresenter.cs
@@ -51,6 +51,7 @@ namespace PdfScribeCore
                 simpleTaskDialog.Icon = this.DefaultTaskIcon;
                 simpleTaskDialog.StandardButtons = APICodePack.TaskDialogStandardButtons.Close;
                 simpleTaskDialog.Opened += new EventHandler(simpleTaskDialog_Opened);
+                simpleTaskDialog.StartupLocation = APICodePack.TaskDialogStartupLocation.CenterScreen;
                 simpleTaskDialog.Show();
             }
         }