Free cookie consent management tool by TermsFeed Policy Generator

Changeset 6734


Ignore:
Timestamp:
09/11/11 21:54:39 (12 years ago)
Author:
ascheibe
Message:

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

Location:
branches/HeuristicLab.Hive-3.4/sources
Files:
27 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/HiveAdministratorClient.cs

    r6688 r6734  
    2020#endregion
    2121
    22 using System.Collections.Generic;
    2322using HeuristicLab.Common;
    2423using HeuristicLab.Core;
     
    2726  [Item("Hive Administrator", "Hive Administrator")]
    2827  public class HiveAdministratorClient : Item {
    29     public List<SlaveGroup> SlaveGroups;
    30     public List<Slave> Slaves;
    31 
    3228
    3329    public HiveAdministratorClient() {
    34       UpdateSlaveGroups();
    3530    }
    3631
     
    4237      return new HiveAdministratorClient(this, cloner);
    4338    }
    44 
    45     public void UpdateSlaveGroups() {
    46       ServiceLocator.Instance.CallHiveService(service => {
    47         SlaveGroups = new List<SlaveGroup>(service.GetSlaveGroups());
    48         Slaves = new List<Slave>(service.GetSlaves());
    49       });
    50     }
    5139  }
    5240}
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/Common/UpdateControl.cs

    r6721 r6734  
    3232    public Action UpdateAction { get; set; }
    3333
     34    public void Update() {
     35      btnRefresh_Click(this, null);
     36    }
     37
    3438    private void PrivUpdateAction() {
    3539      UpdateAction();
    36       imgBoxProgress.Invoke(new MethodInvoker(() => imgBoxProgress.Visible = false));
     40      if (imgBoxProgress.InvokeRequired) {
     41        imgBoxProgress.Invoke(new MethodInvoker(() => imgBoxProgress.Visible = false));
     42      } else {
     43        imgBoxProgress.Visible = false;
     44      }
    3745    }
    3846
    3947    private void btnRefresh_Click(object sender, EventArgs e) {
    4048      if (UpdateAction != null) {
    41         imgBoxProgress.Visible = true;
     49        if (imgBoxProgress.InvokeRequired) {
     50          imgBoxProgress.Invoke(new MethodInvoker(() => imgBoxProgress.Visible = true));
     51        } else {
     52          imgBoxProgress.Visible = true;
     53        }
     54
    4255        Action action = new Action(PrivUpdateAction);
    4356        TS.Task task = new TS.Task(action);
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.Designer.cs

    r6688 r6734  
    8585      this.Name = "HiveAdministrationView";
    8686      this.Size = new System.Drawing.Size(745, 546);
    87       this.Load += new System.EventHandler(this.HiveAdministrationView_Load);
    8887      this.tabAdmin.ResumeLayout(false);
    8988      this.tabSlaves.ResumeLayout(false);
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.cs

    r6688 r6734  
    2121
    2222using System.Windows.Forms;
    23 using HeuristicLab.Core;
    2423using HeuristicLab.Core.Views;
    2524using HeuristicLab.MainForm;
     
    4039    #region Register Content Events
    4140    protected override void DeregisterContentEvents() {
    42       // TODO: Deregister your event handlers on the Content here
    4341      base.DeregisterContentEvents();
    4442    }
    4543    protected override void RegisterContentEvents() {
    4644      base.RegisterContentEvents();
    47       // TODO: Register your event handlers on the Content here
    4845    }
    4946    #endregion
    5047
    51     private void UpdateResources() {
    52       IItemList<Resource> resources = new ItemList<Resource>();
    53 
    54       foreach (SlaveGroup g in Content.SlaveGroups) {
    55         resources.Add(g);
    56       }
    57       foreach (Slave g in Content.Slaves) {
    58         resources.Add(g);
    59       }
    60       resourcesView.Content = resources;
    61     }
    62 
    6348    protected override void OnContentChanged() {
    6449      base.OnContentChanged();
    65       if (Content == null) {
    66         resourcesView.Content = null;
    67 
    68       } else {
    69         //updateSlaveGroups.UpdateAction = new Action(Content.UpdateSlaveGroups);  //??
    70         UpdateResources();
    71       }
    7250    }
    7351
    7452    protected override void SetEnabledStateOfControls() {
    7553      base.SetEnabledStateOfControls();
    76       // TODO: Put code here to enable or disable controls based on whether the Content is/not null or the view is ReadOnly
    7754    }
    78 
    79     private void HiveAdministrationView_Load(object sender, System.EventArgs e) {
    80       if (Content != null) {
    81 
    82       }
    83     }
    84 
    85     #region Event Handlers
    86     // TODO: Put event handlers here
    87     #endregion
    8855  }
    8956}
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

    r6688 r6734  
    4949      updateScheduleControl.UpdateAction = new Action(UpdateSchedule);
    5050      updateSlaveGroup.UpdateAction = new Action(UpdateSlaveGroups);
    51     }
     51
     52      updateSlaveGroup.Update();
     53    }
     54
    5255
    5356    #region Register Content Events
     
    131134    protected override void SetEnabledStateOfControls() {
    132135      base.SetEnabledStateOfControls();
    133       // TODO: Put code here to enable or disable controls based on whether the Content is/not null or the view is ReadOnly
    134136    }
    135137
     
    293295    void ResetView() {
    294296      treeSlaveGroup.Nodes.Clear();
     297
    295298      if (slaveView.Content != null && slaveView.Content is SlaveGroup) {
    296299        slaveView.Content.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(SlaveViewContent_PropertyChanged);
     
    301304
    302305    private void UpdateSlaveGroups() {
    303       this.Invoke(new Action(ResetView));
    304       Content.Clear();
     306      if (this.InvokeRequired) {
     307        this.Invoke(new Action(ResetView));
     308      } else {
     309        ResetView();
     310      }
     311
    305312      IItemList<Resource> resources = new ItemList<Resource>();
    306313
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.Designer.cs

    r6730 r6734  
    3838      this.slaveMainView.Name = "slaveMainView";
    3939      this.slaveMainView.ReadOnly = false;
    40       this.slaveMainView.Size = new System.Drawing.Size(588, 329);
     40      this.slaveMainView.Size = new System.Drawing.Size(588, 328);
    4141      this.slaveMainView.TabIndex = 0;
    42       this.slaveMainView.WindowState = System.Windows.Forms.FormWindowState.Normal;
    4342      //
    4443      // MainWindow
     
    4645      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    4746      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    48       this.ClientSize = new System.Drawing.Size(612, 353);
     47      this.ClientSize = new System.Drawing.Size(612, 352);
    4948      this.Controls.Add(this.slaveMainView);
    5049      this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.cs

    r6730 r6734  
    2121
    2222
     23using System;
    2324using System.Windows.Forms;
    2425using HeuristicLab.Clients.Hive.SlaveCore.Views;
     
    2829    public MainWindow() {
    2930      InitializeComponent();
    30       slaveMainView.WindowStateChanged += new System.EventHandler<Common.EventArgs<FormWindowState>>(slaveMainView_WindowStateChanged);
     31      slaveMainView.VisibilitySwitched += new System.EventHandler(slaveMainView_WindowStateChanged);
    3132    }
    3233
    33     void slaveMainView_WindowStateChanged(object sender, Common.EventArgs<FormWindowState> e) {
    34       WindowState = e.Value;
    35       if (WindowState == FormWindowState.Minimized) {
     34    void slaveMainView_WindowStateChanged(object sender, EventArgs e) {
     35      if (this.Visible) {
    3636        Hide();
    37       } else if (WindowState == FormWindowState.Normal) {
     37      } else {
    3838        Show();
    3939      }
     
    4747      if (e.CloseReason == CloseReason.UserClosing) {
    4848        e.Cancel = true;
    49         slaveMainView.MinimizeToTray();
     49        Hide();
    5050      }
    5151    }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/MainWindow.Designer.cs

    r6730 r6734  
    3939      this.slaveMainView.Name = "slaveMainView";
    4040      this.slaveMainView.ReadOnly = false;
    41       this.slaveMainView.Size = new System.Drawing.Size(662, 471);
     41      this.slaveMainView.Size = new System.Drawing.Size(588, 328);
    4242      this.slaveMainView.TabIndex = 0;
    43       this.slaveMainView.WindowState = System.Windows.Forms.FormWindowState.Normal;
    4443      //
    4544      // MainWindow
     
    4746      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    4847      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    49       this.ClientSize = new System.Drawing.Size(686, 495);
     48      this.ClientSize = new System.Drawing.Size(612, 352);
    5049      this.Controls.Add(this.slaveMainView);
    5150      this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
    5251      this.Name = "MainWindow";
    5352      this.Text = "HeuristicLab Hive Slave";
     53      this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainWindow_FormClosing);
    5454      this.ResumeLayout(false);
    5555
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/MainWindow.cs

    r6730 r6734  
    2020#endregion
    2121
     22using System;
    2223using System.Windows.Forms;
    2324using HeuristicLab.Clients.Hive.SlaveCore.Views;
     
    3536    public MainWindow() {
    3637      InitializeComponent();
    37       slaveMainView.WindowStateChanged += new System.EventHandler<Common.EventArgs<FormWindowState>>(slaveMainView_WindowStateChanged);
     38      slaveMainView.VisibilitySwitched += new System.EventHandler(slaveMainView_WindowStateChanged);
    3839    }
    3940
    40     void slaveMainView_WindowStateChanged(object sender, Common.EventArgs<FormWindowState> e) {
    41       WindowState = e.Value;
    42       if (WindowState == FormWindowState.Minimized) {
     41    void slaveMainView_WindowStateChanged(object sender, EventArgs e) {
     42      if (this.Visible) {
    4343        Hide();
    44       } else if (WindowState == FormWindowState.Normal) {
     44      } else {
    4545        Show();
    4646      }
    4747    }
    4848
    49     internal void MinimizeToTray() {
    50       slaveMainView.MinimizeToTray();
    51     }
    52 
    53     internal void RestoreFromTray() {
    54       slaveMainView.RestoreFromTray();
     49    private void MainWindow_FormClosing(object sender, FormClosingEventArgs e) {
     50      if (e.CloseReason == CloseReason.UserClosing) {
     51        e.Cancel = true;
     52        Hide();
     53      }
    5554    }
    5655  }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/Program.cs

    r6698 r6734  
    2222      MainWindow mw = new MainWindow();
    2323      if (args.Length < 1 || (args.Length > 0 && args[0] != Settings.Default.ShowUICmd)) {
    24         mw.MinimizeToTray();
     24        mw.Hide();
    2525      } else if (args.Length > 0 && args[0] == Settings.Default.ShowUICmd) {
    26         mw.RestoreFromTray();
     26        mw.Show();
    2727      }
    2828
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/AboutView.cs

    r6248 r6734  
    2727
    2828namespace HeuristicLab.Clients.Hive.SlaveCore.Views {
    29   [View("AboutView: Show some information about HeursticLab Hive")]
     29  [View("About View: Show some information about HeursticLab Hive")]
    3030  public partial class AboutView : ItemView {
    3131    public new Item Content {
     
    4949    protected override void OnContentChanged() {
    5050      base.OnContentChanged();
    51       if (Content == null) {
    52       } else {
    53       }
    5451    }
    5552
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/JobsView.cs

    r6725 r6734  
    2626
    2727namespace HeuristicLab.Clients.Hive.SlaveCore.Views {
    28   [View("JobsView")]
     28  [View("Jobs View")]
    2929  [Content(typeof(SlaveItem), IsDefaultView = false)]
    3030  public partial class JobsView : ItemView {
     
    5151    protected override void OnContentChanged() {
    5252      base.OnContentChanged();
    53       if (Content == null) {
    54       } else {
    55       }
    5653    }
    5754
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/LogView.cs

    r6371 r6734  
    6161    protected override void OnContentChanged() {
    6262      base.OnContentChanged();
    63       if (Content == null) {
    64       } else {
    65       }
    6663    }
    6764
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/Properties/Settings.Designer.cs

    r6456 r6734  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.225
     4//     Runtime Version:4.0.30319.235
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    5959            }
    6060        }
     61       
     62        [global::System.Configuration.UserScopedSettingAttribute()]
     63        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     64        [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Clients.Hive.SlaveCore.WindowsService")]
     65        public string ServiceName {
     66            get {
     67                return ((string)(this["ServiceName"]));
     68            }
     69            set {
     70                this["ServiceName"] = value;
     71            }
     72        }
    6173    }
    6274}
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/Properties/Settings.settings

    r6456 r6734  
    1212      <Value Profile="(Default)">SlaveCommunicationServiceEndpoint</Value>
    1313    </Setting>
     14    <Setting Name="ServiceName" Type="System.String" Scope="User">
     15      <Value Profile="(Default)">HeuristicLab.Clients.Hive.SlaveCore.WindowsService</Value>
     16    </Setting>
    1417  </Settings>
    1518</SettingsFile>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsBase.cs

    r6730 r6734  
    4949    #region Register Content Events
    5050    protected override void DeregisterContentEvents() {
    51       Content.SlaveShutdown -= new System.EventHandler(Content_SlaveShutdown);
    52       Content.SlaveStatusChanged -= new System.EventHandler<EventArgs<StatusCommons>>(Content_SlaveStatusChanged);
     51
    5352      Content.SlaveDisplayStateChanged -= new EventHandler<EventArgs<SlaveDisplayStat>>(Content_SlaveDisplayStateChanged);
    5453      Content.CoreConnectionChanged -= new EventHandler<EventArgs<CoreConnection>>(Content_CoreConnectionChanged);
     
    6059      base.RegisterContentEvents();
    6160
    62       Content.SlaveShutdown += new System.EventHandler(Content_SlaveShutdown);
    63       Content.SlaveStatusChanged += new System.EventHandler<EventArgs<StatusCommons>>(Content_SlaveStatusChanged);
    6461      Content.SlaveDisplayStateChanged += new EventHandler<EventArgs<SlaveDisplayStat>>(Content_SlaveDisplayStateChanged);
    6562      Content.CoreConnectionChanged += new EventHandler<EventArgs<CoreConnection>>(Content_CoreConnectionChanged);
     
    7572    protected override void SetEnabledStateOfControls() {
    7673      base.SetEnabledStateOfControls();
    77       //do nothing at the moment, we have nothing editable
    7874    }
    7975
    8076    #region Event Handlers
    81     protected void Content_SlaveStatusChanged(object sender, EventArgs<StatusCommons> e) {
    82 
    83     }
    84 
    85     protected void Content_SlaveShutdown(object sender, System.EventArgs e) {
    86 
    87     }
    88 
    8977    protected virtual void Content_SlaveDisplayStateChanged(object sender, EventArgs<SlaveDisplayStat> e) {
    9078      lastSlaveDisplayStat = e.Value;
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveCmdsWithKill.cs

    r6730 r6734  
    3030using HeuristicLab.MainForm;
    3131
    32 
    3332namespace HeuristicLab.Clients.Hive.SlaveCore.Views {
    3433
    35   [View("HeuristicLab Slave Cmds View")]
     34  [View("HeuristicLab Slave Cmds with Kill View")]
    3635  [Content(typeof(SlaveItem), IsDefaultView = false)]
    3736  public partial class SlaveCmdsWithKill : SlaveCmdsBase {
    38     private const string serviceName = "HeuristicLab.Clients.Hive.SlaveCore.SlaveWindowsService";
     37    private string serviceName = Settings.Default.ServiceName;
    3938
    4039    private const UInt32 BCM_SETSHIELD = 0x160C;
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainView.cs

    r6730 r6734  
    2222using System.Windows.Forms;
    2323using HeuristicLab.MainForm;
    24 
    2524
    2625namespace HeuristicLab.Clients.Hive.SlaveCore.Views {
     
    6160    protected override void SetEnabledStateOfControls() {
    6261      base.SetEnabledStateOfControls();
    63       //do nothing at the moment, we have nothing editable
    6462    }
    6563  }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewBase.Designer.cs

    r6730 r6734  
    7979      this.mainTabControl.Name = "mainTabControl";
    8080      this.mainTabControl.SelectedIndex = 0;
    81       this.mainTabControl.Size = new System.Drawing.Size(653, 501);
     81      this.mainTabControl.Size = new System.Drawing.Size(653, 444);
    8282      this.mainTabControl.TabIndex = 2;
    8383      //
     
    8787      this.tabSlaveView.Name = "tabSlaveView";
    8888      this.tabSlaveView.Padding = new System.Windows.Forms.Padding(3);
    89       this.tabSlaveView.Size = new System.Drawing.Size(645, 475);
     89      this.tabSlaveView.Size = new System.Drawing.Size(645, 418);
    9090      this.tabSlaveView.TabIndex = 0;
    9191      this.tabSlaveView.Text = "Overview";
     
    9797      this.tabJobs.Location = new System.Drawing.Point(4, 22);
    9898      this.tabJobs.Name = "tabJobs";
    99       this.tabJobs.Size = new System.Drawing.Size(639, 421);
     99      this.tabJobs.Size = new System.Drawing.Size(645, 418);
    100100      this.tabJobs.TabIndex = 3;
    101101      this.tabJobs.Text = "Jobs";
     
    112112      this.jobsView.Name = "jobsView";
    113113      this.jobsView.ReadOnly = false;
    114       this.jobsView.Size = new System.Drawing.Size(632, 414);
     114      this.jobsView.Size = new System.Drawing.Size(638, 411);
    115115      this.jobsView.TabIndex = 0;
    116116      //
     
    121121      this.tabLog.Name = "tabLog";
    122122      this.tabLog.Padding = new System.Windows.Forms.Padding(3);
    123       this.tabLog.Size = new System.Drawing.Size(639, 421);
     123      this.tabLog.Size = new System.Drawing.Size(645, 418);
    124124      this.tabLog.TabIndex = 1;
    125125      this.tabLog.Text = "Log";
     
    136136      this.logView.Name = "logView";
    137137      this.logView.ReadOnly = false;
    138       this.logView.Size = new System.Drawing.Size(626, 406);
     138      this.logView.Size = new System.Drawing.Size(632, 405);
    139139      this.logView.TabIndex = 0;
    140140      //
     
    144144      this.tabAbout.Location = new System.Drawing.Point(4, 22);
    145145      this.tabAbout.Name = "tabAbout";
    146       this.tabAbout.Size = new System.Drawing.Size(639, 421);
     146      this.tabAbout.Size = new System.Drawing.Size(645, 418);
    147147      this.tabAbout.TabIndex = 2;
    148148      this.tabAbout.Text = "About HeuristicLab Hive";
     
    159159      this.aboutView.Name = "aboutView";
    160160      this.aboutView.ReadOnly = false;
    161       this.aboutView.Size = new System.Drawing.Size(613, 329);
     161      this.aboutView.Size = new System.Drawing.Size(639, 412);
    162162      this.aboutView.TabIndex = 0;
    163163      //
     
    216216      this.Controls.Add(this.mainTabControl);
    217217      this.Name = "SlaveMainViewBase";
    218       this.Size = new System.Drawing.Size(653, 501);
     218      this.Size = new System.Drawing.Size(653, 444);
    219219      this.mainTabControl.ResumeLayout(false);
    220220      this.tabJobs.ResumeLayout(false);
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewBase.cs

    r6730 r6734  
    2525using System.Windows.Forms;
    2626using HeuristicLab.Clients.Hive.SlaveCore.Views.Properties;
    27 using HeuristicLab.Common;
    2827using HeuristicLab.Core.Views;
    2928using HeuristicLab.MainForm;
    3029
    31 
    3230namespace HeuristicLab.Clients.Hive.SlaveCore.Views {
    3331
    34   [View("HeuristicLab Slave Main View")]
     32  [View("HeuristicLab Slave Main View Base")]
    3533  [Content(typeof(SlaveItem), IsDefaultView = false)]
    3634  public partial class SlaveMainViewBase : ItemView {
    3735
    38     public FormWindowState WindowState { get; set; }
    39 
    40     public event EventHandler<EventArgs<FormWindowState>> WindowStateChanged;
    41     public void OnWindowStateChanged(FormWindowState msg) {
    42       var handler = WindowStateChanged;
    43       if (handler != null) handler(this, new EventArgs<FormWindowState>(msg));
     36    public event EventHandler VisibilitySwitched;
     37    public void OnVisibilitySwitched() {
     38      var handler = VisibilitySwitched;
     39      if (handler != null) handler(this, new EventArgs());
    4440    }
    4541
     
    6157    public SlaveMainViewBase() {
    6258      InitializeComponent();
    63       WindowState = FormWindowState.Normal;
    6459    }
    6560
     
    7772      base.OnContentChanged();
    7873
    79       //cSlaveView.Content = Content;
    8074      jobsView.Content = Content;
    8175      logView.Content = Content;
     
    8983    protected override void SetEnabledStateOfControls() {
    9084      base.SetEnabledStateOfControls();
    91       //do nothing at the moment, we have nothing editable
    9285    }
    9386
    9487    private void notifyIcon_DoubleClick(object sender, EventArgs e) {
    95       if (WindowState == FormWindowState.Normal) {
    96         MinimizeToTray();
    97       } else {
    98         RestoreFromTray();
    99       }
     88      OnVisibilitySwitched();
    10089    }
    10190
     
    10594
    10695    private void showToolStripMenuItem_Click(object sender, EventArgs e) {
    107       if (WindowState != FormWindowState.Normal) {
    108         RestoreFromTray();
    109       }
    110     }
    111 
    112     public void MinimizeToTray() {
    113       WindowState = FormWindowState.Minimized;
    114       OnWindowStateChanged(WindowState);
    115     }
    116 
    117     public void RestoreFromTray() {
    118       WindowState = FormWindowState.Normal;
    119       OnWindowStateChanged(WindowState);
     96      OnVisibilitySwitched();
    12097    }
    12198
    12299    private void notifyIcon_BalloonTipClicked(object sender, EventArgs e) {
    123       RestoreFromTray();
     100      OnVisibilitySwitched();
    124101    }
    125102
     
    127104      System.Diagnostics.Process.Start("http://dev.heuristiclab.com");
    128105    }
    129 
    130106
    131107    private void Connector() {
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveMainViewTray.cs

    r6730 r6734  
    2626namespace HeuristicLab.Clients.Hive.SlaveCore.Views {
    2727
    28   [View("HeuristicLab Slave Main View")]
     28  [View("HeuristicLab Slave Main Tray View")]
    2929  [Content(typeof(SlaveItem), IsDefaultView = false)]
    3030  public partial class SlaveMainViewTray : SlaveMainViewBase {
     
    6161    protected override void SetEnabledStateOfControls() {
    6262      base.SetEnabledStateOfControls();
    63       //do nothing at the moment, we have nothing editable
    6463    }
    6564  }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveStats.cs

    r6730 r6734  
    7676    protected override void SetEnabledStateOfControls() {
    7777      base.SetEnabledStateOfControls();
    78       //do nothing at the moment, we have nothing editable
    7978    }
    8079
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveView.Designer.cs

    r6730 r6734  
    6969      this.slaveCmds.TabIndex = 1;
    7070      //
    71       // CSlaveView
     71      // SlaveView
    7272      //
    7373      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
     
    7575      this.Controls.Add(this.slaveCmds);
    7676      this.Controls.Add(this.slaveStats);
    77       this.Name = "CSlaveView";
    78       this.Size = new System.Drawing.Size(532, 355);
     77      this.Name = "SlaveView";
     78      this.Size = new System.Drawing.Size(520, 320);
    7979      this.ResumeLayout(false);
    8080
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveView.cs

    r6730 r6734  
    5959    }
    6060
    61 
    6261    protected override void SetEnabledStateOfControls() {
    6362      base.SetEnabledStateOfControls();
    64       //do nothing at the moment, we have nothing editable
    6563    }
    66 
    6764  }
    6865}
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveViewTray.Designer.cs

    r6730 r6734  
    7676      this.Controls.Add(this.slaveStats);
    7777      this.Name = "SlaveViewTray";
    78       this.Size = new System.Drawing.Size(532, 355);
     78      this.Size = new System.Drawing.Size(520, 320);
    7979      this.ResumeLayout(false);
    8080
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.3/SlaveViewTray.cs

    r6730 r6734  
    2727namespace HeuristicLab.Clients.Hive.SlaveCore.Views {
    2828
    29   [View("HeuristicLab Slave View")]
     29  [View("HeuristicLab Slave Tray View")]
    3030  [Content(typeof(SlaveItem), IsDefaultView = false)]
    3131  public partial class SlaveViewTray : ItemView {
     
    5959    }
    6060
    61 
    6261    protected override void SetEnabledStateOfControls() {
    6362      base.SetEnabledStateOfControls();
    64       //do nothing at the moment, we have nothing editable
    6563    }
    66 
    6764  }
    6865}
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/app_ascheibe.config

    r6712 r6734  
    105105    <client>
    106106      <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
    107       <endpoint address="http://services.heuristiclab.com/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService">
     107      <endpoint address="http://localhost/HiveService.svc"
     108                binding="wsHttpBinding"
     109                bindingConfiguration="wsHttpBinding_Hive"
     110                contract="HeuristicLab.Clients.Hive.IHiveService"
     111                name="wsHttpBinding_IHiveService">
    108112        <identity>
    109           <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>
    110         </identity>
     113          <certificate encodedValue="AwAAAAEAAAAUAAAAiQt8DnyaI8rYHhLNyW62i58+eG8gAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhAFNFYz6Srdmk3PZJ/mka5sMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTIwNjE0MTc0M1oXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCueTMWJzOZ1IBacG40aWdr3qDWijEO4VwhgtNr+WNFsRG+qW2rTZZFtaC0U028aj3MX13mr+pzpcPJMes2rr38PuxhN6BhdzgRfyEy/eHk4iKqZztuJSXgNAyfyjhovTchLitT2lilddTRFj2PlLYv+PUu+QhQNTm2iW4UDljS9wIDAQABo0kwRzBFBgNVHQEEPjA8gBBeipmIklE3kPz7i+AdKqAgoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghAFNFYz6Srdmk3PZJ/mka5sMAkGBSsOAwIdBQADgYEAGnxEaFT8QKKk1DtJ8/+TOBxSo0UkBlNiTY0HKkA3w/2DOPZKybhslm8gqJic8ZPsk5YgEibrdQqB0AnNG983RAlFqgGvsAbQAMXTDJ5GoTgHaxk/T+7a7Sk4xJALUL/vWuPGbA354RVoKA4gV3gJzU+Fj3/fLACf0+D/nR9B5nw=" />
     114        </identity> 
    111115      </endpoint>
    112116    </client>
Note: See TracChangeset for help on using the changeset viewer.