Merge pull request #2 from vercellone/master

Apply options dialog Interval property immediately
onlyutkarsh · Jun 4, 2015 · d15d24b · d15d24b
2 parents 59458a6 + 4877f6d
commit d15d24b
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 6 deletions.
diff --git a/VSOStatusInspector.Package/EventArgs/OptionsChangedEventArgs.cs b/VSOStatusInspector.Package/EventArgs/OptionsChangedEventArgs.cs
@@ -0,0 +1,5 @@
+namespace VSOStatusInspector {
+    public class OptionsChangedEventArgs : System.EventArgs {
+        public double Interval { get; set; }
+    }
+}
diff --git a/VSOStatusInspector.Package/VSOStatusInspector.Package.csproj b/VSOStatusInspector.Package/VSOStatusInspector.Package.csproj
@@ -131,6 +131,7 @@
     </COMReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="EventArgs\OptionsChangedEventArgs.cs" />
     <Compile Include="Guids.cs" />
     <Compile Include="NativeMethods.cs" />
     <Compile Include="VSOStatusInspectorOptions.cs">

diff --git a/VSOStatusInspector.Package/VSOStatusInspectorOptions.cs b/VSOStatusInspector.Package/VSOStatusInspectorOptions.cs
@@ -19,5 +19,20 @@ public int Interval
             get { return _interval; }
             set { _interval = value; }
         }
+
+        protected override void OnApply(PageApplyEventArgs e)
+        {
+            base.OnApply(e);
+            if (OnOptionsChanged != null)
+            {
+                var optionsEventArg = new OptionsChangedEventArgs
+                {
+                    Interval = Interval,
+                };
+                OnOptionsChanged(this, optionsEventArg);
+            }
+        }
+
+        public event EventHandler<OptionsChangedEventArgs> OnOptionsChanged;
     }
 }
diff --git a/VSOStatusInspector.Package/VSOStatusInspectorPackage.cs b/VSOStatusInspector.Package/VSOStatusInspectorPackage.cs
@@ -18,14 +18,15 @@ namespace VSOStatusInspector
     [ProvideAutoLoad(UIContextGuids80.SolutionExists)]
     [ProvideBindingPath]
     [ProvideOptionPage(typeof(VSOStatusInspectorOptions), EXTENSION_NAME, "General", 0, 0, true)]
-    public sealed class VSOStatusInspectorPackage : Package
+    public sealed class VSOStatusInspectorPackage : Package, IDisposable
     {
         private const string EXTENSION_NAME = "VSO Status Inspector";
         private IVsStatusbar _bar;
         private IntPtr _hdcBitmap = IntPtr.Zero;
         private VSOStatusInspectorOptions _options;
         private Guid _paneGuid = new Guid("{170638A1-CFD7-47C8-975A-FBAA9E532AD5}");
         private IVsOutputWindow _outputWindow;
+        private Timer _timer;
 
         public VSOStatusInspectorPackage()
         {
@@ -45,15 +46,19 @@ protected override void Initialize()
 
             //get interval from options
             _options = (VSOStatusInspectorOptions)GetDialogPage(typeof(VSOStatusInspectorOptions));
+            if (_options != null)
+            {
+                _options.OnOptionsChanged += OnOptionsChanged;
+            }
 
             //call the timer code first without waiting for timer trigger
             OnTimerTick(null, null);
 
             //Set the timer
-            var timer = new Timer();
-            timer.Interval = TimeSpan.FromSeconds(_options.Interval).TotalMilliseconds;
-            timer.Elapsed += OnTimerTick;
-            timer.Start();
+            _timer = new Timer();
+            _timer.Interval = TimeSpan.FromSeconds(_options.Interval).TotalMilliseconds;
+            _timer.Elapsed += OnTimerTick;
+            _timer.Start();
         }
 
         private void WriteToOutputWindow(string message)
@@ -154,6 +159,12 @@ private void OnTimerTick(object sender, ElapsedEventArgs e)
             }
         }
 
+        private void OnOptionsChanged(object sender, OptionsChangedEventArgs e)
+        {
+            _timer.Interval = TimeSpan.FromSeconds(e.Interval).TotalMilliseconds;
+            WriteToOutputWindow(String.Format("Interval changed to {0} seconds", e.Interval));
+        }
+
         /// <summary>
         /// Gets the status bar.
         /// </summary>
@@ -208,6 +219,13 @@ public static Bitmap ResizeImage(Bitmap imgToResize, int newHeight)
             return bitmap;
         }
 
-
+        public void Dispose()
+        {
+            if (_timer != null)
+            {
+                _timer.Dispose();
+            }
+        }
+
     }
 }