1.1 --- a/Server/MainForm.Designer.cs Tue Jan 26 18:51:36 2016 +0100
1.2 +++ b/Server/MainForm.Designer.cs Tue Feb 02 18:59:45 2016 +0100
1.3 @@ -53,7 +53,7 @@
1.4 this.tabPageClients = new System.Windows.Forms.TabPage();
1.5 this.buttonCloseClients = new System.Windows.Forms.Button();
1.6 this.buttonStartClient = new System.Windows.Forms.Button();
1.7 - this.treeViewClients = new System.Windows.Forms.TreeView();
1.8 + this.iTreeViewClients = new System.Windows.Forms.TreeView();
1.9 this.tabPageDisplay = new System.Windows.Forms.TabPage();
1.10 this.buttonShowClock = new System.Windows.Forms.Button();
1.11 this.buttonHideClock = new System.Windows.Forms.Button();
1.12 @@ -246,7 +246,7 @@
1.13 //
1.14 this.tabPageClients.Controls.Add(this.buttonCloseClients);
1.15 this.tabPageClients.Controls.Add(this.buttonStartClient);
1.16 - this.tabPageClients.Controls.Add(this.treeViewClients);
1.17 + this.tabPageClients.Controls.Add(this.iTreeViewClients);
1.18 this.tabPageClients.Location = new System.Drawing.Point(4, 22);
1.19 this.tabPageClients.Name = "tabPageClients";
1.20 this.tabPageClients.Padding = new System.Windows.Forms.Padding(3);
1.21 @@ -275,16 +275,16 @@
1.22 this.buttonStartClient.UseVisualStyleBackColor = true;
1.23 this.buttonStartClient.Click += new System.EventHandler(this.buttonStartClient_Click);
1.24 //
1.25 - // treeViewClients
1.26 + // iTreeViewClients
1.27 //
1.28 - this.treeViewClients.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
1.29 + this.iTreeViewClients.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
1.30 | System.Windows.Forms.AnchorStyles.Left)
1.31 | System.Windows.Forms.AnchorStyles.Right)));
1.32 - this.treeViewClients.Location = new System.Drawing.Point(87, 6);
1.33 - this.treeViewClients.Name = "treeViewClients";
1.34 - this.treeViewClients.Size = new System.Drawing.Size(499, 233);
1.35 - this.treeViewClients.TabIndex = 0;
1.36 - this.treeViewClients.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeViewClients_AfterSelect);
1.37 + this.iTreeViewClients.Location = new System.Drawing.Point(87, 6);
1.38 + this.iTreeViewClients.Name = "iTreeViewClients";
1.39 + this.iTreeViewClients.Size = new System.Drawing.Size(499, 233);
1.40 + this.iTreeViewClients.TabIndex = 0;
1.41 + this.iTreeViewClients.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeViewClients_AfterSelect);
1.42 //
1.43 // tabPageDisplay
1.44 //
1.45 @@ -993,7 +993,7 @@
1.46 private MarqueeLabel marqueeLabelTop;
1.47 private MarqueeLabel marqueeLabelBottom;
1.48 private System.Windows.Forms.TabPage tabPageClients;
1.49 - private System.Windows.Forms.TreeView treeViewClients;
1.50 + private System.Windows.Forms.TreeView iTreeViewClients;
1.51 private System.Windows.Forms.TabPage tabPageDisplay;
1.52 private System.Windows.Forms.CheckBox checkBoxFixedPitchFontOnly;
1.53 private System.Windows.Forms.Button buttonSuspend;
2.1 --- a/Server/MainForm.cs Tue Jan 26 18:51:36 2016 +0100
2.2 +++ b/Server/MainForm.cs Tue Feb 02 18:59:45 2016 +0100
2.3 @@ -1403,7 +1403,7 @@
2.4 foreach (var client in inactiveClients)
2.5 {
2.6 iClients.Remove(client);
2.7 - Program.iMainForm.treeViewClients.Nodes.Remove(Program.iMainForm.treeViewClients.Nodes.Find(client, false)[0]);
2.8 + Program.iMainForm.iTreeViewClients.Nodes.Remove(Program.iMainForm.iTreeViewClients.Nodes.Find(client, false)[0]);
2.9 }
2.10 }
2.11
2.12 @@ -1565,7 +1565,9 @@
2.13 if (Program.iMainForm.iClients.Keys.Contains(aSessionId))
2.14 {
2.15 Program.iMainForm.iClients.Remove(aSessionId);
2.16 - Program.iMainForm.treeViewClients.Nodes.Remove(Program.iMainForm.treeViewClients.Nodes.Find(aSessionId, false)[0]);
2.17 + Program.iMainForm.iTreeViewClients.Nodes.Remove(Program.iMainForm.iTreeViewClients.Nodes.Find(aSessionId, false)[0]);
2.18 + //Update recording status too whenever a client is removed
2.19 + UpdateRecordingNotification();
2.20 }
2.21
2.22 if (iCurrentClientSessionId == aSessionId)
2.23 @@ -1938,7 +1940,7 @@
2.24 TreeNode node = null;
2.25 //Check that our client node already exists
2.26 //Get our client root node using its key which is our session ID
2.27 - TreeNode[] nodes = treeViewClients.Nodes.Find(aClient.SessionId, false);
2.28 + TreeNode[] nodes = iTreeViewClients.Nodes.Find(aClient.SessionId, false);
2.29 if (nodes.Count()>0)
2.30 {
2.31 //We already have a node for that client
2.32 @@ -1949,8 +1951,8 @@
2.33 else
2.34 {
2.35 //Client node does not exists create a new one
2.36 - treeViewClients.Nodes.Add(aClient.SessionId, aClient.SessionId);
2.37 - node = treeViewClients.Nodes.Find(aClient.SessionId, false)[0];
2.38 + iTreeViewClients.Nodes.Add(aClient.SessionId, aClient.SessionId);
2.39 + node = iTreeViewClients.Nodes.Find(aClient.SessionId, false)[0];
2.40 }
2.41
2.42 if (node != null)