mmclibrary-cvs Mailing List for MMC .NET Library (Page 4)

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

Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/PropertyPages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9837

Modified Files:
	PropertyPage.cs PropertyPageBase.cs PropertySheet.cs 
Log Message:
Invoke fix for propertypages:
I added some functionality to 'speak' to the MMCThread from a propertypage thread. 
You can override PropertyPageBase::InvokeMmcAfterClose(), the contents of this function are used after the propertypage closes.

PropertySheet.cs
- fixed a typo in a var (m_alPages -> m_allPages)
- removed a onCancelClick from onCloseClick so that the dialogresult that would be returned by ShowDialog was correct, the dialogresult isn't used right now but that doesn't mean that it should be correct :)
- removed a double case in onCancelClick (default==.No)

PropertyPageBase.cs
- changed init() -> Init()
- added functionality for the Invoke fix

PropertyPage.cs
- added functionality for the Invoke fix

ReportNode.cs
- added functionality for the Invoke fix

BaseNode.cs
- added functionality for the Invoke fix

Index: PropertyPageBase.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/PropertyPages/PropertyPageBase.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PropertyPageBase.cs	22 Jul 2004 14:07:05 -0000	1.5
--- PropertyPageBase.cs	15 Nov 2004 19:43:49 -0000	1.6
***************
*** 22,25 ****
--- 22,27 ----
  		private System.ComponentModel.Container components = null;

+ 		public delegate void PropertyPageAction();
+ 
  		///////////////////////////////////////////////////////////////////////
  		//
***************
*** 28,31 ****
--- 30,35 ----
  		#region
  		protected PropertyPage m_propertypage;
+ 
+ 		protected PropertyPageAction m_action;
  		#endregion

***************
*** 50,54 ****
  				this.m_propertypage.validate += new EventHandler(onValidateEvent);
  				this.m_propertypage.cancel += new EventHandler(onCancelEvent);				
! 				this.init();
  			}
  		}
--- 54,58 ----
  				this.m_propertypage.validate += new EventHandler(onValidateEvent);
  				this.m_propertypage.cancel += new EventHandler(onCancelEvent);				
! 				this.Init();
  			}
  		}
***************
*** 97,100 ****
--- 101,110 ----
  			}
  		}
+ 
+ 		public PropertyPageAction Action
+ 		{
+ 			get{ return m_action;}
+ 			set {m_action = value;}
+ 		}
  		#endregion

***************
*** 107,110 ****
--- 117,121 ----
  		{
  			this.PropertyPage = pp;
+ 			this.Action = new PropertyPageAction(InvokeMmcAfterClose);
  		}

***************
*** 112,115 ****
--- 123,127 ----
  		{
  			InitializeComponent();
+ 			this.Action = new PropertyPageAction(InvokeMmcAfterClose);
  		}
  		#endregion
***************
*** 119,123 ****
  		/// the corresponding items in the propertypage).
  		/// </summary>
! 		public virtual void init() 
  		{
  		}
--- 131,143 ----
  		/// the corresponding items in the propertypage).
  		/// </summary>
! 		public virtual void Init() 
! 		{
! 		}
! 
! 		/// <summary>
! 		/// Override this method to do certain work in the MMCThread(BaseThread) after the propertysheet
! 		/// is closed.
! 		/// </summary>
! 		protected virtual void InvokeMmcAfterClose()
  		{
  		}
***************
*** 133,139 ****
  			// The apply button is only active if there is something to apply,
  			// if it isn't active the OK action should only cancel, not apply+cancel
- 			//if(((PropertySheetExt)this.m_propertypage.PropertySheet).IsApplyEnabled())
  			if((this.m_propertypage.PropertySheet).IsApplyEnabled())
! 				this.onApply();		
  		}

--- 153,161 ----
  			// The apply button is only active if there is something to apply,
  			// if it isn't active the OK action should only cancel, not apply+cancel
  			if((this.m_propertypage.PropertySheet).IsApplyEnabled())
! 			{
! 				this.onApply();
! 				this.PropertyPage.Applied = true;
! 			}
  		}

Index: PropertyPage.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/PropertyPages/PropertyPage.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PropertyPage.cs	22 Jul 2004 14:07:05 -0000	1.4
--- PropertyPage.cs	15 Nov 2004 19:43:49 -0000	1.5
***************
*** 11,14 ****
--- 11,16 ----
  	public class PropertyPage
  	{
+ 		
+ 
  		////////////////////////////////////////////////////////////////////////////
  		//
***************
*** 45,48 ****
--- 47,55 ----
  		/// </summary>
  		protected ArrayList m_items = new ArrayList();
+ 
+ 		/// <summary>
+ 		/// Indicates if the Apply button is pressed
+ 		/// </summary>
+ 		protected bool m_applied = false;
  		#endregion

***************
*** 122,126 ****
  		}

! 		protected UserControl MainControl 
  		{
  			get 
--- 129,133 ----
  		}

! 		public UserControl MainControl 
  		{
  			get 
***************
*** 167,170 ****
--- 174,184 ----
  		}

+ 		public bool Applied
+ 		{
+ 			get { return m_applied;}
+ 			set { m_applied = value;}
+ 		}
+ 
+ 
  		#endregion

***************
*** 211,214 ****
--- 225,229 ----
  		#endregion

+ 
  		/// <summary>
  		/// Generate the actual TabPage that will  used in the PropertySheet.
***************
*** 272,276 ****

  		/// <summary>
! 		/// Method that gets called to apply the values in the TabPage 
  		/// </summary>
  		public virtual void onApply()
--- 287,292 ----

  		/// <summary>
! 		/// Method that gets called to apply the values in the TabPage
! 		/// (Remember to call the base.onApply if you override this one)
  		/// </summary>
  		public virtual void onApply()

Index: PropertySheet.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/PropertyPages/PropertySheet.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PropertySheet.cs	19 Oct 2004 20:50:43 -0000	1.10
--- PropertySheet.cs	15 Nov 2004 19:43:49 -0000	1.11
***************
*** 57,61 ****
  		/// Typed collection of PropertyPages to display
  		/// </summary>
! 		PropertyPageList m_alPages = new PropertyPageList();

  		/// <summary>
--- 57,61 ----
  		/// Typed collection of PropertyPages to display
  		/// </summary>
! 		PropertyPageList m_allPages = new PropertyPageList();

  		/// <summary>
***************
*** 93,97 ****
  		public PropertyPageList Pages
  		{
! 			get{ return m_alPages; }
  		}

--- 93,97 ----
  		public PropertyPageList Pages
  		{
! 			get{ return m_allPages; }
  		}

***************
*** 175,179 ****

  			// We'll be as wide as the widest and tall as the tallest page
! 			foreach (PropertyPage page in m_alPages)
  			{
  				// Initialize the Property Pages
--- 175,179 ----

  			// We'll be as wide as the widest and tall as the tallest page
! 			foreach (PropertyPage page in m_allPages)
  			{
  				// Initialize the Property Pages
***************
*** 189,193 ****

  			// Add the pages to the sheet
! 			foreach (PropertyPage page in m_alPages)
  			{
  				// Create a Tab page that we can use
--- 189,193 ----

  			// Add the pages to the sheet
! 			foreach (PropertyPage page in m_allPages)
  			{
  				// Create a Tab page that we can use
***************
*** 297,305 ****
  		{   
  			bool isValidData;
! 			PropertyPage page = m_alPages[m_tc.SelectedIndex];
  			isValidData = page.ValidateData();
  			if (isValidData)
  			{
! 				foreach(PropertyPage pages in m_alPages)
  					pages.TabChange();
  			}
--- 297,305 ----
  		{   
  			bool isValidData;
! 			PropertyPage page = m_allPages[m_tc.SelectedIndex];
  			isValidData = page.ValidateData();
  			if (isValidData)
  			{
! 				foreach(PropertyPage pages in m_allPages)
  					pages.TabChange();
  			}
***************
*** 314,318 ****
  			Node.EditMode = false;
  			e.Cancel = false;
! 			onCancelClick(o, e);
  		}

--- 314,320 ----
  			Node.EditMode = false;
  			e.Cancel = false;
! 
! 			// this one is not needed, double, made the DialogResult go poof.
! 			//onCancelClick(o, e);
  		}

***************
*** 324,328 ****
  		void onOkClick(Object o, EventArgs e)
  		{
! 			PropertyPage page = m_alPages[m_tc.SelectedIndex];

  			if (page.ValidateData())
--- 326,330 ----
  		void onOkClick(Object o, EventArgs e)
  		{
! 			PropertyPage page = m_allPages[m_tc.SelectedIndex];

  			if (page.ValidateData())
***************
*** 352,370 ****
  						onApplyClick(o, e);
  						break;
! 					case DialogResult.No:
! 						base.DialogResult = DialogResult.Cancel;
! 						
! 						foreach(PropertyPage page in m_alPages)
! 							page.onCancel();
! 						FakeClose();
! 						break;
  					case DialogResult.Cancel:

  						base.DialogResult = DialogResult.None;
  						break;
  					default:
  						base.DialogResult = DialogResult.Cancel;

! 						foreach(PropertyPage page in m_alPages)
  							page.onCancel();
  						FakeClose();
--- 354,367 ----
  						onApplyClick(o, e);
  						break;
! 
  					case DialogResult.Cancel:

  						base.DialogResult = DialogResult.None;
  						break;
+ 
  					default:
  						base.DialogResult = DialogResult.Cancel;

! 						foreach(PropertyPage page in m_allPages)
  							page.onCancel();
  						FakeClose();
***************
*** 376,380 ****
  				base.DialogResult = DialogResult.Cancel;

! 				foreach(PropertyPage page in m_alPages)
  					page.onCancel();
  				FakeClose();
--- 373,377 ----
  				base.DialogResult = DialogResult.Cancel;

! 				foreach(PropertyPage page in m_allPages)
  					page.onCancel();
  				FakeClose();
***************
*** 391,395 ****
  		void onApplyClick(Object o, EventArgs e)
  		{
! 			PropertyPage psp = m_alPages[m_tc.SelectedIndex];

  			if (psp.ValidateData())
--- 388,392 ----
  		void onApplyClick(Object o, EventArgs e)
  		{
! 			PropertyPage psp = m_allPages[m_tc.SelectedIndex];

  			if (psp.ValidateData())
***************
*** 416,421 ****
  		private void SendApplyToAll()
  		{
! 			foreach(PropertyPage page in m_alPages)
  				page.onApply();
  		}

--- 413,421 ----
  		private void SendApplyToAll()
  		{
! 			foreach(PropertyPage page in m_allPages)
! 			{
! 				page.Applied = true;
  				page.onApply();
+ 			}
  		}

***************
*** 451,455 ****
  			base.DialogResult = DialogResult.Cancel;

! 			foreach(PropertyPage page in m_alPages)
  				page.onCancel();
  			FakeClose();	
--- 451,455 ----
  			base.DialogResult = DialogResult.Cancel;

! 			foreach(PropertyPage page in m_allPages)
  				page.onCancel();
  			FakeClose();	

2004	Jan	Feb	Mar (17)	Apr (96)	May (15)	Jun (1)	Jul (43)	Aug (4)	Sep (11)	Oct (8)	Nov (15)	Dec (9)
2005	Jan (31)	Feb	Mar (24)	Apr (6)	May	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec
2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec

mmclibrary-cvs Mailing List for MMC .NET Library (Page 4)

mmclibrary-cvs — MMC Library CVS Checkins