Changeset 6734 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/MainWindow.cs

Timestamp:

09/11/11 21:54:39 (13 years ago)

Author:

ascheibe

Message:

#1233 some minor improvements in the Slave UI and Administrator UI

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/MainWindow.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/MainWindow.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Windows.Forms;
 using HeuristicLab.Clients.Hive.SlaveCore.Views;
@@ -35 +36 @@
     public MainWindow() {
       InitializeComponent();
-      slaveMainView.WindowStateChanged += new System.EventHandler<Common.EventArgs<FormWindowState>>(slaveMainView_WindowStateChanged);
+      slaveMainView.VisibilitySwitched += new System.EventHandler(slaveMainView_WindowStateChanged);
     }
 
-    void slaveMainView_WindowStateChanged(object sender, Common.EventArgs<FormWindowState> e) {
-      WindowState = e.Value;
-      if (WindowState == FormWindowState.Minimized) {
+    void slaveMainView_WindowStateChanged(object sender, EventArgs e) {
+      if (this.Visible) {
         Hide();
-      } else if (WindowState == FormWindowState.Normal) {
+      } else {
         Show();
       }
     }
 
-    internal void MinimizeToTray() {
-      slaveMainView.MinimizeToTray();
-    }
-
-    internal void RestoreFromTray() {
-      slaveMainView.RestoreFromTray();
+    private void MainWindow_FormClosing(object sender, FormClosingEventArgs e) {
+      if (e.CloseReason == CloseReason.UserClosing) {
+        e.Cancel = true;
+        Hide();
+      }
     }
   }