[Ccnet-checkins] ccnet/project/CCTrayLib/Presentation MainForm.cs,1.6,1.7

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	MainForm.cs 
Log Message:
CCNET-35 - update namespaces of classes within CCTrayMulti so they match ccnet naming convention
Rename TestingProjectMonitor to StubMonitor as that better descibes what it does

Index: MainForm.cs
===================================================================
RCS file: /cvsroot/ccnet/ccnet/project/CCTrayLib/Presentation/MainForm.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MainForm.cs	5 Jun 2005 21:52:34 -0000	1.6
--- MainForm.cs	26 Jun 2005 15:26:35 -0000	1.7
***************
*** 1,13 ****
  using System;
  using System.ComponentModel;
- using System.Diagnostics;
- using System.Threading;
  using System.Windows.Forms;
- using ThoughtWorks.CruiseControl.CCTrayLib.Configuration;
  using ThoughtWorks.CruiseControl.CCTrayLib.Monitoring;
- using ThoughtWorks.CruiseControl.CCTrayLib.Presentation;
- using ThoughtWorks.CruiseControl.CCTrayLib.ServerConnection;

! namespace CCTrayMulti
  {
  	public class MainForm : Form
--- 1,8 ----
  using System;
  using System.ComponentModel;
  using System.Windows.Forms;
  using ThoughtWorks.CruiseControl.CCTrayLib.Monitoring;

! namespace ThoughtWorks.CruiseControl.CCTrayLib.Presentation
  {
  	public class MainForm : Form
***************
*** 33,39 ****
  		private ColumnHeader colActivity;
  		private IContainer components;
! 		private System.Windows.Forms.MenuItem mnuFilePreferences;
! 		private System.Windows.Forms.MenuItem menuItem3;
! 		private System.Windows.Forms.ColumnHeader colDetail;

  		private MainFormController controller;
--- 28,34 ----
  		private ColumnHeader colActivity;
  		private IContainer components;
! 		private MenuItem mnuFilePreferences;
! 		private MenuItem menuItem3;
! 		private ColumnHeader colDetail;

  		private MainFormController controller;
***************
*** 48,58 ****
  			InitializeComponent();

! 			
  			DataBindings.Add( "Icon", controller.ProjectStateIconAdaptor, "Icon" );
  			trayIcon.BindToIconProvider( controller.ProjectStateIconAdaptor );

! 			controller.PotentiallyHookUpBuildOccurredEvents(trayIcon);
! 			controller.BindToListView(lvProjects);

  			ApplyDataBinding();
--- 43,53 ----
  			InitializeComponent();

! 
  			DataBindings.Add( "Icon", controller.ProjectStateIconAdaptor, "Icon" );
  			trayIcon.BindToIconProvider( controller.ProjectStateIconAdaptor );

! 			controller.PotentiallyHookUpBuildOccurredEvents( trayIcon );
! 			controller.BindToListView( lvProjects );

  			ApplyDataBinding();
***************
*** 86,90 ****
  		{
  			this.components = new System.ComponentModel.Container();
! 			System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(MainForm));
  			this.lvProjects = new System.Windows.Forms.ListView();
  			this.colProject = new System.Windows.Forms.ColumnHeader();
--- 81,85 ----
  		{
  			this.components = new System.ComponentModel.Container();
! 			System.Resources.ResourceManager resources = new System.Resources.ResourceManager( typeof (MainForm) );
  			this.lvProjects = new System.Windows.Forms.ListView();
  			this.colProject = new System.Windows.Forms.ColumnHeader();
***************
*** 94,99 ****
  			this.mnuForce = new System.Windows.Forms.MenuItem();
  			this.mnuWebPage = new System.Windows.Forms.MenuItem();
! 			this.largeIconList = new System.Windows.Forms.ImageList(this.components);
! 			this.iconList = new System.Windows.Forms.ImageList(this.components);
  			this.mainMenu = new System.Windows.Forms.MainMenu();
  			this.menuFile = new System.Windows.Forms.MenuItem();
--- 89,94 ----
  			this.mnuForce = new System.Windows.Forms.MenuItem();
  			this.mnuWebPage = new System.Windows.Forms.MenuItem();
! 			this.largeIconList = new System.Windows.Forms.ImageList( this.components );
! 			this.iconList = new System.Windows.Forms.ImageList( this.components );
  			this.mainMenu = new System.Windows.Forms.MainMenu();
  			this.menuFile = new System.Windows.Forms.MenuItem();
***************
*** 114,134 ****
  			// lvProjects
  			// 
! 			this.lvProjects.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
! 																						 this.colProject,
! 																						 this.colActivity,
! 																						 this.colDetail,
! 																						 this.colLastBuildLabel});
  			this.lvProjects.ContextMenu = this.projectContextMenu;
  			this.lvProjects.Dock = System.Windows.Forms.DockStyle.Fill;
  			this.lvProjects.LargeImageList = this.largeIconList;
! 			this.lvProjects.Location = new System.Drawing.Point(0, 0);
  			this.lvProjects.MultiSelect = false;
  			this.lvProjects.Name = "lvProjects";
! 			this.lvProjects.Size = new System.Drawing.Size(892, 305);
  			this.lvProjects.SmallImageList = this.iconList;
  			this.lvProjects.TabIndex = 0;
  			this.lvProjects.View = System.Windows.Forms.View.Details;
! 			this.lvProjects.DoubleClick += new System.EventHandler(this.lvProjects_DoubleClick);
! 			this.lvProjects.SelectedIndexChanged += new System.EventHandler(this.lvProjects_SelectedIndexChanged);
  			// 
  			// colProject
--- 109,131 ----
  			// lvProjects
  			// 
! 			this.lvProjects.Columns.AddRange( new System.Windows.Forms.ColumnHeader[]
! 				{
! 					this.colProject,
! 					this.colActivity,
! 					this.colDetail,
! 					this.colLastBuildLabel
! 				} );
  			this.lvProjects.ContextMenu = this.projectContextMenu;
  			this.lvProjects.Dock = System.Windows.Forms.DockStyle.Fill;
  			this.lvProjects.LargeImageList = this.largeIconList;
! 			this.lvProjects.Location = new System.Drawing.Point( 0, 0 );
  			this.lvProjects.MultiSelect = false;
  			this.lvProjects.Name = "lvProjects";
! 			this.lvProjects.Size = new System.Drawing.Size( 892, 305 );
  			this.lvProjects.SmallImageList = this.iconList;
  			this.lvProjects.TabIndex = 0;
  			this.lvProjects.View = System.Windows.Forms.View.Details;
! 			this.lvProjects.DoubleClick += new System.EventHandler( this.lvProjects_DoubleClick );
! 			this.lvProjects.SelectedIndexChanged += new System.EventHandler( this.lvProjects_SelectedIndexChanged );
  			// 
  			// colProject
***************
*** 149,155 ****
  			// projectContextMenu
  			// 
! 			this.projectContextMenu.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
! 																							   this.mnuForce,
! 																							   this.mnuWebPage});
  			// 
  			// mnuForce
--- 146,154 ----
  			// projectContextMenu
  			// 
! 			this.projectContextMenu.MenuItems.AddRange( new System.Windows.Forms.MenuItem[]
! 				{
! 					this.mnuForce,
! 					this.mnuWebPage
! 				} );
  			// 
  			// mnuForce
***************
*** 157,161 ****
  			this.mnuForce.Index = 0;
  			this.mnuForce.Text = "&Force Build";
! 			this.mnuForce.Click += new System.EventHandler(this.mnuForce_Click);
  			// 
  			// mnuWebPage
--- 156,160 ----
  			this.mnuForce.Index = 0;
  			this.mnuForce.Text = "&Force Build";
! 			this.mnuForce.Click += new System.EventHandler( this.mnuForce_Click );
  			// 
  			// mnuWebPage
***************
*** 163,193 ****
  			this.mnuWebPage.Index = 1;
  			this.mnuWebPage.Text = "Display &Web Page";
! 			this.mnuWebPage.Click += new System.EventHandler(this.mnuWebPage_Click);
  			// 
  			// largeIconList
  			// 
! 			this.largeIconList.ImageSize = new System.Drawing.Size(32, 32);
! 			this.largeIconList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("largeIconList.ImageStream")));
  			this.largeIconList.TransparentColor = System.Drawing.Color.Transparent;
  			// 
  			// iconList
  			// 
! 			this.iconList.ImageSize = new System.Drawing.Size(16, 16);
! 			this.iconList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("iconList.ImageStream")));
  			this.iconList.TransparentColor = System.Drawing.Color.Transparent;
  			// 
  			// mainMenu
  			// 
! 			this.mainMenu.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
! 																					 this.menuFile,
! 																					 this.menuItem1});
  			// 
  			// menuFile
  			// 
  			this.menuFile.Index = 0;
! 			this.menuFile.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
! 																					 this.mnuFilePreferences,
! 																					 this.menuItem3,
! 																					 this.menuFileExit});
  			this.menuFile.Text = "&File";
  			// 
--- 162,196 ----
  			this.mnuWebPage.Index = 1;
  			this.mnuWebPage.Text = "Display &Web Page";
! 			this.mnuWebPage.Click += new System.EventHandler( this.mnuWebPage_Click );
  			// 
  			// largeIconList
  			// 
! 			this.largeIconList.ImageSize = new System.Drawing.Size( 32, 32 );
! 			this.largeIconList.ImageStream = ((System.Windows.Forms.ImageListStreamer) (resources.GetObject( "largeIconList.ImageStream" )));
  			this.largeIconList.TransparentColor = System.Drawing.Color.Transparent;
  			// 
  			// iconList
  			// 
! 			this.iconList.ImageSize = new System.Drawing.Size( 16, 16 );
! 			this.iconList.ImageStream = ((System.Windows.Forms.ImageListStreamer) (resources.GetObject( "iconList.ImageStream" )));
  			this.iconList.TransparentColor = System.Drawing.Color.Transparent;
  			// 
  			// mainMenu
  			// 
! 			this.mainMenu.MenuItems.AddRange( new System.Windows.Forms.MenuItem[]
! 				{
! 					this.menuFile,
! 					this.menuItem1
! 				} );
  			// 
  			// menuFile
  			// 
  			this.menuFile.Index = 0;
! 			this.menuFile.MenuItems.AddRange( new System.Windows.Forms.MenuItem[]
! 				{
! 					this.mnuFilePreferences,
! 					this.menuItem3,
! 					this.menuFileExit
! 				} );
  			this.menuFile.Text = "&File";
  			// 
***************
*** 196,200 ****
  			this.mnuFilePreferences.Index = 0;
  			this.mnuFilePreferences.Text = "&Preferences";
! 			this.mnuFilePreferences.Click += new System.EventHandler(this.mnuFilePreferences_Click);
  			// 
  			// menuItem3
--- 199,203 ----
  			this.mnuFilePreferences.Index = 0;
  			this.mnuFilePreferences.Text = "&Preferences";
! 			this.mnuFilePreferences.Click += new System.EventHandler( this.mnuFilePreferences_Click );
  			// 
  			// menuItem3
***************
*** 207,219 ****
  			this.menuFileExit.Index = 2;
  			this.menuFileExit.Text = "E&xit";
! 			this.menuFileExit.Click += new System.EventHandler(this.menuFileExit_Click);
  			// 
  			// menuItem1
  			// 
  			this.menuItem1.Index = 1;
! 			this.menuItem1.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
! 																					  this.mnuViewIcons,
! 																					  this.mnuViewList,
! 																					  this.mnuViewDetails});
  			this.menuItem1.Text = "&View";
  			// 
--- 210,224 ----
  			this.menuFileExit.Index = 2;
  			this.menuFileExit.Text = "E&xit";
! 			this.menuFileExit.Click += new System.EventHandler( this.menuFileExit_Click );
  			// 
  			// menuItem1
  			// 
  			this.menuItem1.Index = 1;
! 			this.menuItem1.MenuItems.AddRange( new System.Windows.Forms.MenuItem[]
! 				{
! 					this.mnuViewIcons,
! 					this.mnuViewList,
! 					this.mnuViewDetails
! 				} );
  			this.menuItem1.Text = "&View";
  			// 
***************
*** 222,226 ****
  			this.mnuViewIcons.Index = 0;
  			this.mnuViewIcons.Text = "&Icons";
! 			this.mnuViewIcons.Click += new System.EventHandler(this.mnuViewIcons_Click);
  			// 
  			// mnuViewList
--- 227,231 ----
  			this.mnuViewIcons.Index = 0;
  			this.mnuViewIcons.Text = "&Icons";
! 			this.mnuViewIcons.Click += new System.EventHandler( this.mnuViewIcons_Click );
  			// 
  			// mnuViewList
***************
*** 228,232 ****
  			this.mnuViewList.Index = 1;
  			this.mnuViewList.Text = "&List";
! 			this.mnuViewList.Click += new System.EventHandler(this.mnuViewList_Click);
  			// 
  			// mnuViewDetails
--- 233,237 ----
  			this.mnuViewList.Index = 1;
  			this.mnuViewList.Text = "&List";
! 			this.mnuViewList.Click += new System.EventHandler( this.mnuViewList_Click );
  			// 
  			// mnuViewDetails
***************
*** 234,238 ****
  			this.mnuViewDetails.Index = 2;
  			this.mnuViewDetails.Text = "&Details";
! 			this.mnuViewDetails.Click += new System.EventHandler(this.mnuViewDetails_Click);
  			// 
  			// trayIcon
--- 239,243 ----
  			this.mnuViewDetails.Index = 2;
  			this.mnuViewDetails.Text = "&Details";
! 			this.mnuViewDetails.Click += new System.EventHandler( this.mnuViewDetails_Click );
  			// 
  			// trayIcon
***************
*** 242,255 ****
  			this.trayIcon.Text = "CruiseControl.NET\n(This tooltip information still to be implemented)";
  			this.trayIcon.Visible = true;
! 			this.trayIcon.Click += new System.EventHandler(this.trayIcon_Click);
  			// 
  			// panel1
  			// 
  			this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
! 			this.panel1.Controls.Add(this.btnForceBuild);
  			this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
! 			this.panel1.Location = new System.Drawing.Point(0, 260);
  			this.panel1.Name = "panel1";
! 			this.panel1.Size = new System.Drawing.Size(892, 45);
  			this.panel1.TabIndex = 1;
  			// 
--- 247,260 ----
  			this.trayIcon.Text = "CruiseControl.NET\n(This tooltip information still to be implemented)";
  			this.trayIcon.Visible = true;
! 			this.trayIcon.Click += new System.EventHandler( this.trayIcon_Click );
  			// 
  			// panel1
  			// 
  			this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
! 			this.panel1.Controls.Add( this.btnForceBuild );
  			this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
! 			this.panel1.Location = new System.Drawing.Point( 0, 260 );
  			this.panel1.Name = "panel1";
! 			this.panel1.Size = new System.Drawing.Size( 892, 45 );
  			this.panel1.TabIndex = 1;
  			// 
***************
*** 257,266 ****
  			// 
  			this.btnForceBuild.FlatStyle = System.Windows.Forms.FlatStyle.System;
! 			this.btnForceBuild.Location = new System.Drawing.Point(10, 10);
  			this.btnForceBuild.Name = "btnForceBuild";
! 			this.btnForceBuild.Size = new System.Drawing.Size(85, 23);
  			this.btnForceBuild.TabIndex = 0;
  			this.btnForceBuild.Text = "Force Build";
! 			this.btnForceBuild.Click += new System.EventHandler(this.btnForceBuild_Click);
  			// 
  			// colDetail
--- 262,271 ----
  			// 
  			this.btnForceBuild.FlatStyle = System.Windows.Forms.FlatStyle.System;
! 			this.btnForceBuild.Location = new System.Drawing.Point( 10, 10 );
  			this.btnForceBuild.Name = "btnForceBuild";
! 			this.btnForceBuild.Size = new System.Drawing.Size( 85, 23 );
  			this.btnForceBuild.TabIndex = 0;
  			this.btnForceBuild.Text = "Force Build";
! 			this.btnForceBuild.Click += new System.EventHandler( this.btnForceBuild_Click );
  			// 
  			// colDetail
***************
*** 271,284 ****
  			// MainForm
  			// 
! 			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
! 			this.ClientSize = new System.Drawing.Size(892, 305);
! 			this.Controls.Add(this.panel1);
! 			this.Controls.Add(this.lvProjects);
! 			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
  			this.Menu = this.mainMenu;
  			this.Name = "MainForm";
  			this.Text = "CruiseControl.NET";
! 			this.panel1.ResumeLayout(false);
! 			this.ResumeLayout(false);

  		}
--- 276,289 ----
  			// MainForm
  			// 
! 			this.AutoScaleBaseSize = new System.Drawing.Size( 5, 13 );
! 			this.ClientSize = new System.Drawing.Size( 892, 305 );
! 			this.Controls.Add( this.panel1 );
! 			this.Controls.Add( this.lvProjects );
! 			this.Icon = ((System.Drawing.Icon) (resources.GetObject( "$this.Icon" )));
  			this.Menu = this.mainMenu;
  			this.Name = "MainForm";
  			this.Text = "CruiseControl.NET";
! 			this.panel1.ResumeLayout( false );
! 			this.ResumeLayout( false );

  		}
***************
*** 292,297 ****

- 
- 
  		private void lvProjects_SelectedIndexChanged( object sender, EventArgs e )
  		{
--- 297,300 ----
***************
*** 339,343 ****

- 
  		private void trayIcon_Click( object sender, EventArgs e )
  		{
--- 342,345 ----
***************
*** 364,368 ****
  		}

! 		private void mnuFilePreferences_Click(object sender, System.EventArgs e)
  		{
  			controller.ShowPreferencesDialog();
--- 366,370 ----
  		}

! 		private void mnuFilePreferences_Click( object sender, EventArgs e )
  		{
  			controller.ShowPreferencesDialog();

[Ccnet-checkins] ccnet/project/CCTrayLib/Presentation MainForm.cs,1.6,1.7

An automated continuous integration server for the .NET platform

[Ccnet-checkins] ccnet/project/CCTrayLib/Presentation MainForm.cs,1.6,1.7