Changeset 431 for branches/eraser6/Eraser/MainForm.cs

Timestamp:

9/28/2008 3:24:03 PM (4 years ago)

Author:

lowjoel

Message:

Have a "hide when minimised" behaviour to Eraser.

File:

• branches/eraser6/Eraser/MainForm.cs (modified) (8 diffs)

branches/eraser6/Eraser/MainForm.cs

@@ -57 +57 @@
                 new Executor.TaskProcessedEvent(OnTaskProcessed);
 
+            //Check the notification area context menu's minimise to tray item.
+            hideWhenMinimiseToolStripMenuItem.Checked = HideWhenMinimised;
+
             //Create the toolbar control
             ToolBar.Name = "toolBar";
@@ -186 +189 @@
             //And the logo
             Bitmap logo = Properties.Resources.BackgroundLogo;
-            dc.DrawImage(logo, new Point(ClientSize.Width - logo.Width - 10,
-                (contentPanel.Top - logo.Height) / 2));
+            dc.DrawImage(logo, new Rectangle(ClientSize.Width - logo.Width - 10,
+                (contentPanel.Top - logo.Height) / 2, logo.Width, logo.Height));
 
             dc.SmoothingMode = SmoothingMode.AntiAlias;
@@ -201 +204 @@
         private void MainForm_Resize(object sender, EventArgs e)
         {
-            if (WindowState == FormWindowState.Normal)
+            if (WindowState != FormWindowState.Minimized)
             {
                 Bitmap bmp = new Bitmap(Width, Height);
@@ -209 +212 @@
                 CreateGraphics().DrawImage(bmp, new Point(0, 0));
             }
-            else if (WindowState == FormWindowState.Minimized)
+            else if (HideWhenMinimised)
             {
                 Hide();
@@ -233 +236 @@
         }
 
+        #region Task processing code (for notification area animation)
         void OnTaskProcessing(Eraser.Manager.Task task)
         {
@@ -280 +284 @@
             Resources.NotifyBusy10
         };
-
+        #endregion
+
+        #region Minimise to tray code
+        private bool HideWhenMinimised
+        {
+            get
+            {
+                Dictionary<string, object> settings =
+                    ManagerLibrary.Instance.Settings.PluginSettings;
+                return settings.ContainsKey("HideWhenMinimised") ?
+                    (bool)settings["HideWhenMinimised"] : true;
+            }
+
+            set
+            {
+                Dictionary<string, object> settings =
+                    ManagerLibrary.Instance.Settings.PluginSettings;
+                settings["HideWhenMinimised"] = hideWhenMinimiseToolStripMenuItem.Checked;
+                ManagerLibrary.Instance.Settings.SetSettings(settings);
+            }
+        }
+
+        private bool closedFromNotificationIcon = false;
         private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
         {
-            if (sender == null)
+            if (HideWhenMinimised && (
+                !closedFromNotificationIcon || e.CloseReason != CloseReason.UserClosing))
             {
                 e.Cancel = true;
@@ -290 +317 @@
         }
 
-        private void Show(object sender, EventArgs e)
+        private void openToolStripMenuItem_Click(object sender, EventArgs e)
         {
             Visible = true;
@@ -296 +323 @@
             Activate();
         }
+
+        private void exitToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            closedFromNotificationIcon = true;
+            Close();
+        }
+
+        private void hideWhenMinimiseToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            HideWhenMinimised = hideWhenMinimiseToolStripMenuItem.Checked;
+        }
+        #endregion
     }
 }