[Ccnet-checkins] ccnet/project/CCTrayLib/Presentation CCTrayMultiSettingsForm.cs,1.7,1.8

[David C. <dav...@us...>]

Update of /cvsroot/ccnet/ccnet/project/CCTrayLib/Presentation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5535/project/CCTrayLib/Presentation

Modified Files:
	CCTrayMultiSettingsForm.cs 
Log Message:
CCNET-665 : CCTray Exception Setting unable to handle multiple selections. Remove button now removes all selected projects. Exception no longer occurs because after a removal, no items are selected.

Index: CCTrayMultiSettingsForm.cs
===================================================================
RCS file: /cvsroot/ccnet/ccnet/project/CCTrayLib/Presentation/CCTrayMultiSettingsForm.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CCTrayMultiSettingsForm.cs	13 Sep 2005 15:57:26 -0000	1.7
--- CCTrayMultiSettingsForm.cs	27 Mar 2006 03:01:30 -0000	1.8
***************
*** 1,6 ****
  using System;
  using System.ComponentModel;
- using System.Drawing;
- using System.Resources;
  using System.Windows.Forms;
  using ThoughtWorks.CruiseControl.CCTrayLib.Configuration;
--- 1,4 ----
***************
*** 127,131 ****
  		private void InitializeComponent()
  		{
! 			System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(CCTrayMultiSettingsForm));
  			this.chkShowBalloons = new System.Windows.Forms.CheckBox();
  			this.grpServers = new System.Windows.Forms.GroupBox();
--- 125,129 ----
  		private void InitializeComponent()
  		{
! 			System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof (CCTrayMultiSettingsForm));
  			this.chkShowBalloons = new System.Windows.Forms.CheckBox();
  			this.grpServers = new System.Windows.Forms.GroupBox();
***************
*** 166,170 ****
  			this.grpServers.SuspendLayout();
  			this.grpAudio.SuspendLayout();
! 			((System.ComponentModel.ISupportInitialize)(this.numPollPeriod)).BeginInit();
  			this.SuspendLayout();
  			// 
--- 164,168 ----
  			this.grpServers.SuspendLayout();
  			this.grpAudio.SuspendLayout();
! 			((System.ComponentModel.ISupportInitialize) (this.numPollPeriod)).BeginInit();
  			this.SuspendLayout();
  			// 
***************
*** 180,185 ****
  			// grpServers
  			// 
! 			this.grpServers.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
! 				| System.Windows.Forms.AnchorStyles.Left) 
  				| System.Windows.Forms.AnchorStyles.Right)));
  			this.grpServers.Controls.Add(this.lvProjects);
--- 178,183 ----
  			// grpServers
  			// 
! 			this.grpServers.Anchor = ((System.Windows.Forms.AnchorStyles) ((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
! 				| System.Windows.Forms.AnchorStyles.Left)
  				| System.Windows.Forms.AnchorStyles.Right)));
  			this.grpServers.Controls.Add(this.lvProjects);
***************
*** 199,208 ****
  			// lvProjects
  			// 
! 			this.lvProjects.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
! 				| System.Windows.Forms.AnchorStyles.Left) 
  				| System.Windows.Forms.AnchorStyles.Right)));
! 			this.lvProjects.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
! 																						 this.columnHeader1,
! 																						 this.columnHeader2});
  			this.lvProjects.FullRowSelect = true;
  			this.lvProjects.HideSelection = false;
--- 197,208 ----
  			// lvProjects
  			// 
! 			this.lvProjects.Anchor = ((System.Windows.Forms.AnchorStyles) ((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
! 				| System.Windows.Forms.AnchorStyles.Left)
  				| System.Windows.Forms.AnchorStyles.Right)));
! 			this.lvProjects.Columns.AddRange(new System.Windows.Forms.ColumnHeader[]
! 				{
! 					this.columnHeader1,
! 					this.columnHeader2
! 				});
  			this.lvProjects.FullRowSelect = true;
  			this.lvProjects.HideSelection = false;
***************
*** 226,230 ****
  			// label1
  			// 
! 			this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
  				| System.Windows.Forms.AnchorStyles.Right)));
  			this.label1.Location = new System.Drawing.Point(10, 25);
--- 226,230 ----
  			// label1
  			// 
! 			this.label1.Anchor = ((System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
  				| System.Windows.Forms.AnchorStyles.Right)));
  			this.label1.Location = new System.Drawing.Point(10, 25);
***************
*** 236,240 ****
  			// btnAdd
  			// 
! 			this.btnAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnAdd.Location = new System.Drawing.Point(495, 60);
--- 236,240 ----
  			// btnAdd
  			// 
! 			this.btnAdd.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnAdd.Location = new System.Drawing.Point(495, 60);
***************
*** 246,250 ****
  			// btnMoveDown
  			// 
! 			this.btnMoveDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnMoveDown.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnMoveDown.Location = new System.Drawing.Point(495, 200);
--- 246,250 ----
  			// btnMoveDown
  			// 
! 			this.btnMoveDown.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnMoveDown.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnMoveDown.Location = new System.Drawing.Point(495, 200);
***************
*** 256,260 ****
  			// btnMoveUp
  			// 
! 			this.btnMoveUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnMoveUp.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnMoveUp.Location = new System.Drawing.Point(495, 165);
--- 256,260 ----
  			// btnMoveUp
  			// 
! 			this.btnMoveUp.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnMoveUp.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnMoveUp.Location = new System.Drawing.Point(495, 165);
***************
*** 266,270 ****
  			// btnRemove
  			// 
! 			this.btnRemove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnRemove.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnRemove.Location = new System.Drawing.Point(495, 95);
--- 266,270 ----
  			// btnRemove
  			// 
! 			this.btnRemove.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnRemove.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnRemove.Location = new System.Drawing.Point(495, 95);
***************
*** 297,301 ****
  			// grpAudio
  			// 
! 			this.grpAudio.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
  				| System.Windows.Forms.AnchorStyles.Right)));
  			this.grpAudio.Controls.Add(this.btnStillFailingPlay);
--- 297,301 ----
  			// grpAudio
  			// 
! 			this.grpAudio.Anchor = ((System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
  				| System.Windows.Forms.AnchorStyles.Right)));
  			this.grpAudio.Controls.Add(this.btnStillFailingPlay);
***************
*** 325,329 ****
  			// btnStillFailingPlay
  			// 
! 			this.btnStillFailingPlay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnStillFailingPlay.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnStillFailingPlay.Location = new System.Drawing.Point(495, 95);
--- 325,329 ----
  			// btnStillFailingPlay
  			// 
! 			this.btnStillFailingPlay.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnStillFailingPlay.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnStillFailingPlay.Location = new System.Drawing.Point(495, 95);
***************
*** 334,338 ****
  			// btnStillFailingBrowse
  			// 
! 			this.btnStillFailingBrowse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnStillFailingBrowse.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnStillFailingBrowse.Location = new System.Drawing.Point(410, 95);
--- 334,338 ----
  			// btnStillFailingBrowse
  			// 
! 			this.btnStillFailingBrowse.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnStillFailingBrowse.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnStillFailingBrowse.Location = new System.Drawing.Point(410, 95);
***************
*** 343,347 ****
  			// btnBrokenPlay
  			// 
! 			this.btnBrokenPlay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnBrokenPlay.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnBrokenPlay.Location = new System.Drawing.Point(495, 71);
--- 343,347 ----
  			// btnBrokenPlay
  			// 
! 			this.btnBrokenPlay.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnBrokenPlay.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnBrokenPlay.Location = new System.Drawing.Point(495, 71);
***************
*** 352,356 ****
  			// btnBrokenBrowse
  			// 
! 			this.btnBrokenBrowse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnBrokenBrowse.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnBrokenBrowse.Location = new System.Drawing.Point(410, 71);
--- 352,356 ----
  			// btnBrokenBrowse
  			// 
! 			this.btnBrokenBrowse.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnBrokenBrowse.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnBrokenBrowse.Location = new System.Drawing.Point(410, 71);
***************
*** 361,365 ****
  			// btnFixedPlay
  			// 
! 			this.btnFixedPlay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnFixedPlay.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnFixedPlay.Location = new System.Drawing.Point(495, 47);
--- 361,365 ----
  			// btnFixedPlay
  			// 
! 			this.btnFixedPlay.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnFixedPlay.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnFixedPlay.Location = new System.Drawing.Point(495, 47);
***************
*** 370,374 ****
  			// btnFixedBrowse
  			// 
! 			this.btnFixedBrowse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnFixedBrowse.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnFixedBrowse.Location = new System.Drawing.Point(410, 47);
--- 370,374 ----
  			// btnFixedBrowse
  			// 
! 			this.btnFixedBrowse.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnFixedBrowse.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnFixedBrowse.Location = new System.Drawing.Point(410, 47);
***************
*** 379,383 ****
  			// btnSuccessfulPlay
  			// 
! 			this.btnSuccessfulPlay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnSuccessfulPlay.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnSuccessfulPlay.Location = new System.Drawing.Point(495, 23);
--- 379,383 ----
  			// btnSuccessfulPlay
  			// 
! 			this.btnSuccessfulPlay.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnSuccessfulPlay.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnSuccessfulPlay.Location = new System.Drawing.Point(495, 23);
***************
*** 388,392 ****
  			// btnSuccessfulBrowse
  			// 
! 			this.btnSuccessfulBrowse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnSuccessfulBrowse.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnSuccessfulBrowse.Location = new System.Drawing.Point(410, 23);
--- 388,392 ----
  			// btnSuccessfulBrowse
  			// 
! 			this.btnSuccessfulBrowse.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
  			this.btnSuccessfulBrowse.FlatStyle = System.Windows.Forms.FlatStyle.System;
  			this.btnSuccessfulBrowse.Location = new System.Drawing.Point(410, 23);
***************
*** 397,401 ****
  			// txtAudioFileSuccess
  			// 
! 			this.txtAudioFileSuccess.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
  				| System.Windows.Forms.AnchorStyles.Right)));
  			this.txtAudioFileSuccess.Location = new System.Drawing.Point(112, 24);
--- 397,401 ----
  			// txtAudioFileSuccess
  			// 
! 			this.txtAudioFileSuccess.Anchor = ((System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
  				| System.Windows.Forms.AnchorStyles.Right)));
  			this.txtAudioFileSuccess.Location = new System.Drawing.Point(112, 24);
***************
*** 447,451 ****
  			// txtAudioFileFixed
  			// 
! 			this.txtAudioFileFixed.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
  				| System.Windows.Forms.AnchorStyles.Right)));
  			this.txtAudioFileFixed.Location = new System.Drawing.Point(112, 48);
--- 447,451 ----
  			// txtAudioFileFixed
  			// 
! 			this.txtAudioFileFixed.Anchor = ((System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
  				| System.Windows.Forms.AnchorStyles.Right)));
  			this.txtAudioFileFixed.Location = new System.Drawing.Point(112, 48);
***************
*** 457,461 ****
  			// txtAudioFileBroken
  			// 
! 			this.txtAudioFileBroken.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
  				| System.Windows.Forms.AnchorStyles.Right)));
  			this.txtAudioFileBroken.Location = new System.Drawing.Point(112, 72);
--- 457,461 ----
  			// txtAudioFileBroken
  			// 
! 			this.txtAudioFileBroken.Anchor = ((System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
  				| System.Windows.Forms.AnchorStyles.Right)));
  			this.txtAudioFileBroken.Location = new System.Drawing.Point(112, 72);
***************
*** 467,471 ****
  			// txtAudioFileFailing
  			// 
! 			this.txtAudioFileFailing.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
  				| System.Windows.Forms.AnchorStyles.Right)));
  			this.txtAudioFileFailing.Location = new System.Drawing.Point(112, 96);
--- 467,471 ----
  			// txtAudioFileFailing
  			// 
! 			this.txtAudioFileFailing.Anchor = ((System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
  				| System.Windows.Forms.AnchorStyles.Right)));
  			this.txtAudioFileFailing.Location = new System.Drawing.Point(112, 96);
***************
*** 546,555 ****
  			this.Controls.Add(this.grpServers);
  			this.Controls.Add(this.chkShowBalloons);
! 			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
  			this.Name = "CCTrayMultiSettingsForm";
  			this.Text = "CruiseControl.NET Tray Settings";
  			this.grpServers.ResumeLayout(false);
  			this.grpAudio.ResumeLayout(false);
! 			((System.ComponentModel.ISupportInitialize)(this.numPollPeriod)).EndInit();
  			this.ResumeLayout(false);
  
--- 546,555 ----
  			this.Controls.Add(this.grpServers);
  			this.Controls.Add(this.chkShowBalloons);
! 			this.Icon = ((System.Drawing.Icon) (resources.GetObject("$this.Icon")));
  			this.Name = "CCTrayMultiSettingsForm";
  			this.Text = "CruiseControl.NET Tray Settings";
  			this.grpServers.ResumeLayout(false);
  			this.grpAudio.ResumeLayout(false);
! 			((System.ComponentModel.ISupportInitialize) (this.numPollPeriod)).EndInit();
  			this.ResumeLayout(false);
  
***************
*** 592,596 ****
  		private void btnRemove_Click(object sender, EventArgs e)
  		{
! 			lvProjects.Items.RemoveAt(selectedIndex);
  		}
  
--- 592,601 ----
  		private void btnRemove_Click(object sender, EventArgs e)
  		{
! 			lvProjects.BeginUpdate();
! 			foreach (ListViewItem item in lvProjects.SelectedItems)
! 			{
! 				lvProjects.Items.Remove(item);
! 			}
! 			lvProjects.EndUpdate();
  		}
  
***************
*** 638,643 ****
  			configuration.TrayIconDoubleClickAction =
  				(rdoStatusWindow.Checked
! 				 	? TrayIconDoubleClickAction.ShowStatusWindow
! 				 	: TrayIconDoubleClickAction.NavigateToWebPageOfFirstProject);
  
  			configuration.Audio.BrokenBuildSound = brokenAudio.Value;
--- 643,648 ----
  			configuration.TrayIconDoubleClickAction =
  				(rdoStatusWindow.Checked
! 					? TrayIconDoubleClickAction.ShowStatusWindow
! 					: TrayIconDoubleClickAction.NavigateToWebPageOfFirstProject);
  
  			configuration.Audio.BrokenBuildSound = brokenAudio.Value;