Changeset 431

Timestamp:

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

Author:

lowjoel

Message:

Have a "hide when minimised" behaviour to Eraser.

Location:

branches/eraser6/Eraser

Files:

• MainForm.Designer.cs (modified) (6 diffs)
• MainForm.cs (modified) (8 diffs)
• MainForm.resx (modified) (4 diffs)

branches/eraser6/Eraser/MainForm.Designer.cs

@@ -65 +65 @@
             this.openEraserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
+            this.hideWhenMinimiseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.notificationIconTimer = new System.Windows.Forms.Timer(this.components);
@@ -132 +133 @@
             this.notificationIcon.ContextMenuStrip = this.notificationMenu;
             resources.ApplyResources(this.notificationIcon, "notificationIcon");
-            this.notificationIcon.DoubleClick += new System.EventHandler(this.Show);
+            this.notificationIcon.DoubleClick += new System.EventHandler(this.openToolStripMenuItem_Click);
             // 
             // notificationMenu
@@ -139 +140 @@
             this.openEraserToolStripMenuItem,
             this.toolStripMenuItem1,
+            this.hideWhenMinimiseToolStripMenuItem,
             this.exitToolStripMenuItem});
             this.notificationMenu.Name = "notificationMenu";
@@ -147 +149 @@
             this.openEraserToolStripMenuItem.Name = "openEraserToolStripMenuItem";
             resources.ApplyResources(this.openEraserToolStripMenuItem, "openEraserToolStripMenuItem");
-            this.openEraserToolStripMenuItem.Click += new System.EventHandler(this.Show);
+            this.openEraserToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
             // 
             // toolStripMenuItem1
@@ -154 +156 @@
             resources.ApplyResources(this.toolStripMenuItem1, "toolStripMenuItem1");
             // 
+            // hideWhenMinimiseToolStripMenuItem
+            // 
+            this.hideWhenMinimiseToolStripMenuItem.CheckOnClick = true;
+            this.hideWhenMinimiseToolStripMenuItem.Name = "hideWhenMinimiseToolStripMenuItem";
+            resources.ApplyResources(this.hideWhenMinimiseToolStripMenuItem, "hideWhenMinimiseToolStripMenuItem");
+            this.hideWhenMinimiseToolStripMenuItem.Click += new System.EventHandler(this.hideWhenMinimiseToolStripMenuItem_Click);
+            // 
             // exitToolStripMenuItem
             // 
             this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
             resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem");
+            this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
             // 
             // notificationIconTimer
@@ -197 +207 @@
         private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
         private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem hideWhenMinimiseToolStripMenuItem;
 
     }

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
     }
 }

branches/eraser6/Eraser/MainForm.resx

@@ -221 +221 @@
   </metadata>
   <data name="openEraserToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>152, 22</value>
+    <value>192, 22</value>
   </data>
   <data name="openEraserToolStripMenuItem.Text" xml:space="preserve">
@@ -227 +227 @@
   </data>
   <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>134, 6</value>
+    <value>189, 6</value>
+  </data>
+  <data name="hideWhenMinimiseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>192, 22</value>
+  </data>
+  <data name="hideWhenMinimiseToolStripMenuItem.Text" xml:space="preserve">
+    <value>Hide When Minimised</value>
   </data>
   <data name="exitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>137, 22</value>
+    <value>192, 22</value>
   </data>
   <data name="exitToolStripMenuItem.Text" xml:space="preserve">
@@ -236 +242 @@
   </data>
   <data name="notificationMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>153, 76</value>
+    <value>193, 98</value>
   </data>
   <data name="&gt;&gt;notificationMenu.Name" xml:space="preserve">
@@ -3371 +3377 @@
     <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;hideWhenMinimiseToolStripMenuItem.Name" xml:space="preserve">
+    <value>hideWhenMinimiseToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;hideWhenMinimiseToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;exitToolStripMenuItem.Name" xml:space="preserve">
     <value>exitToolStripMenuItem</value>