mmclibrary-cvs — MMC Library CVS Checkins

[Mmclibrary-cvs] mmclibrary/MMCLib2/Core SnapinStateBase.cs,1.1,1.2

[Lesley v. Z. <ex...@us...>]

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

Modified Files:
	SnapinStateBase.cs 
Log Message:
Changed a lot of protected variables that where storage for properties to private

Index: SnapinStateBase.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Core/SnapinStateBase.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SnapinStateBase.cs	31 Mar 2004 07:58:44 -0000	1.1
--- SnapinStateBase.cs	19 Jan 2005 22:49:22 -0000	1.2
***************
*** 25,35 ****
  	public class SnapinStateBase 
  	{
! 		protected bool m_dirty = false;
  		/// <summary>
  		/// Set this to true when the state has changed (is dirty).
  		/// </summary>
  		public bool Dirty {
! 			get { return this.m_dirty; }
! 			set { this.m_dirty = value; }
  		}
  
--- 25,36 ----
  	public class SnapinStateBase 
  	{
! 		private bool _dirty = false;
  		/// <summary>
+ 		/// Get or set the dirty state
  		/// Set this to true when the state has changed (is dirty).
  		/// </summary>
  		public bool Dirty {
! 			get { return _dirty; }
! 			set { _dirty = value; }
  		}
  

[Mmclibrary-cvs] mmclibrary/MMCLib2/Core SnapinInfo.cs,1.3,1.4

[Lesley v. Z. <ex...@us...>]

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

Modified Files:
	SnapinInfo.cs 
Log Message:
Changed a lot of protected variables that where storage for properties to private

Index: SnapinInfo.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Core/SnapinInfo.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SnapinInfo.cs	22 Jul 2004 14:07:04 -0000	1.3
--- SnapinInfo.cs	19 Jan 2005 22:44:10 -0000	1.4
***************
*** 10,18 ****
  	/// </summary>
  	[AttributeUsage(AttributeTargets.Class)]
! 	public class SnapinInAttribute : System.Attribute
  	{
  		///////////////////////////////////////////////////////////////////////
  		//
! 		// Properties
  		//
  		#region
--- 10,18 ----
  	/// </summary>
  	[AttributeUsage(AttributeTargets.Class)]
! 	public sealed class SnapinInAttribute : System.Attribute
  	{
  		///////////////////////////////////////////////////////////////////////
  		//
! 		// Private vars
  		//
  		#region
***************
*** 20,36 ****
  		/// The name
  		/// </summary>
! 		protected string m_name;
  		/// <summary>
  		/// The company name
  		/// </summary>
! 		protected string m_provider;
  		/// <summary>
  		/// the snapin version
  		/// </summary>
! 		protected string m_version;
  		/// <summary>
  		/// Standalon boolean
  		/// </summary>
! 		protected bool m_standAlone;
  
  		#endregion
--- 20,36 ----
  		/// The name
  		/// </summary>
! 		private string _name;
  		/// <summary>
  		/// The company name
  		/// </summary>
! 		private string _provider;
  		/// <summary>
  		/// the snapin version
  		/// </summary>
! 		private string _version;
  		/// <summary>
  		/// Standalon boolean
  		/// </summary>
! 		private bool _standAlone;
  
  		#endregion
***************
*** 42,77 ****
  		#region
  		/// <summary>
! 		/// The name
  		/// </summary>
  		public string Namestring
  		{
! 			get { return m_name;  }
! 			set { m_name = value; }
  		}
  
  		/// <summary>
! 		/// Provider
  		/// </summary>
  		public string Provider
  		{
! 			get { return m_provider; }
! 			set { m_provider = value; }
  		}
  
  		/// <summary>
! 		/// Version
  		/// </summary>
  		public string Version
  		{
! 			get { return m_version; }
  		}
  
  		/// <summary>
! 		/// StandAlone
  		/// </summary>
  		public bool StandAlone
  		{
! 			get { return m_standAlone; }
! 			set { m_standAlone = value; }
  		}
  		#endregion
--- 42,77 ----
  		#region
  		/// <summary>
! 		/// Get or set the Name
  		/// </summary>
  		public string Namestring
  		{
! 			get { return _name;  }
! 			set { _name = value; }
  		}
  
  		/// <summary>
! 		/// Get or set the Provider
  		/// </summary>
  		public string Provider
  		{
! 			get { return _provider; }
! 			set { _provider = value; }
  		}
  
  		/// <summary>
! 		/// Get the version
  		/// </summary>
  		public string Version
  		{
! 			get { return _version; }
  		}
  
  		/// <summary>
! 		/// Get or set if this snapin is standalone
  		/// </summary>
  		public bool StandAlone
  		{
! 			get { return _standAlone; }
! 			set { _standAlone = value; }
  		}
  		#endregion
***************
*** 82,94 ****
  		//
  		#region
!         /// <summary>
!         /// Default ctor initialize to begnin values
!         /// </summary>
  		public SnapinInAttribute()
  		{
! 			m_name = "unknown";
! 			m_provider = "unknown";
! 			m_standAlone = true;
! 			m_version = null;
  		}
  
--- 82,94 ----
  		//
  		#region
! 		/// <summary>
! 		/// Default ctor initialize to begnin values
! 		/// </summary>
  		public SnapinInAttribute()
  		{
! 			_name = "unknown";
! 			_provider = "unknown";
! 			_standAlone = true;
! 			_version = null;
  		}
  
***************
*** 100,107 ****
  		public SnapinInAttribute(string namestring, string provider)
  		{
! 			m_name = namestring;
! 			m_provider = provider;
! 			m_standAlone = true;
! 			m_version = null;
  		}
  
--- 100,107 ----
  		public SnapinInAttribute(string namestring, string provider)
  		{
! 			_name = namestring;
! 			_provider = provider;
! 			_standAlone = true;
! 			_version = null;
  		}
  
***************
*** 114,121 ****
  		public SnapinInAttribute(string namestring, string provider, string version)
  		{
! 			m_name = namestring;
! 			m_provider = provider;
! 			m_standAlone = true;
! 			m_version = version;
  		}
  
--- 114,121 ----
  		public SnapinInAttribute(string namestring, string provider, string version)
  		{
! 			_name = namestring;
! 			_provider = provider;
! 			_standAlone = true;
! 			_version = version;
  		}
  
***************
*** 129,136 ****
  		public SnapinInAttribute(string namestring, string provider, string version, bool standAlone)
  		{
! 			m_name = namestring;
! 			m_provider = provider;
! 			m_version = version;
! 			m_standAlone = standAlone;
  		}
  		#endregion
--- 129,136 ----
  		public SnapinInAttribute(string namestring, string provider, string version, bool standAlone)
  		{
! 			_name = namestring;
! 			_provider = provider;
! 			_version = version;
! 			_standAlone = standAlone;
  		}
  		#endregion
***************
*** 139,171 ****
  
  	/// <summary>
!     /// Custom attribute applied to snapin about classes.  The presence 
!     /// of this attribute identifies it to the snapin registration utility and 
!     /// associates attribute required during snapin installation to the 
!     /// registry.
!     /// </summary>
  	[AttributeUsage(AttributeTargets.Class)]
! 	public class AboutSnapinAttribute : System.Attribute
  	{
!         /// <summary>
!         /// The type of the snapin we refer to.  we can pull data from 
!         /// the type by reflection
!         /// </summary>
!         protected Type m_SnapinType;
  
!         /// <summary>
!         /// Ctor
!         /// </summary>
!         /// <param name="type"></param>
!         public AboutSnapinAttribute(Type type)
  		{
! 			m_SnapinType = type;
  		}
  
!         /// <summary>
!         /// Get the Type the snapin is based on
!         /// </summary>
  		public Type SnapinType
  		{
! 			get { return m_SnapinType; }
  		}
  	}
--- 139,171 ----
  
  	/// <summary>
! 	/// Custom attribute applied to snapin about classes.  The presence 
! 	/// of this attribute identifies it to the snapin registration utility and 
! 	/// associates attribute required during snapin installation to the 
! 	/// registry.
! 	/// </summary>
  	[AttributeUsage(AttributeTargets.Class)]
! 	public sealed class AboutSnapinAttribute : System.Attribute
  	{
! 		/// <summary>
! 		/// The type of the snapin we refer to.  we can pull data from 
! 		/// the type by reflection
! 		/// </summary>
! 		private Type _SnapinType;
  
! 		/// <summary>
! 		/// Ctor
! 		/// </summary>
! 		/// <param name="type"></param>
! 		public AboutSnapinAttribute(Type type)
  		{
! 			_SnapinType = type;
  		}
  
! 		/// <summary>
! 		/// Get the Type the snapin is based on
! 		/// </summary>
  		public Type SnapinType
  		{
! 			get { return _SnapinType; }
  		}
  	}

[Mmclibrary-cvs] mmclibrary/MMCLib2/Core SnapinBase.cs,1.20,1.21

[Lesley v. Z. <ex...@us...>]

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

Modified Files:
	SnapinBase.cs 
Log Message:
Changed some functions so that they start with a Capital letter (On* functions)
Method parameter names should use a camel case for their names
Changed a lot of protected variables that where storage for properties to private
Added i18n support
changed throw Exceptions to throw SnapinExceptions

Index: SnapinBase.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Core/SnapinBase.cs,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** SnapinBase.cs	7 Nov 2004 14:44:36 -0000	1.20
--- SnapinBase.cs	19 Jan 2005 22:39:15 -0000	1.21
***************
*** 4,7 ****
--- 4,8 ----
  using System.Threading;
  using System.Reflection;
+ using System.Resources;
  using System.Collections;
  using System.Collections.Specialized;
***************
*** 35,47 ****
  		,IPersistStream
  	{
- 
  		/// <summary>
! 		/// 
  		/// </summary>
! 		public System.Windows.Forms.ContextMenu FilterMenu;
  
  		///////////////////////////////////////////////////////////////////////
  		//
! 		// Members
  		//
  		#region
--- 36,48 ----
  		,IPersistStream
  	{
  		/// <summary>
! 		/// Master list of all Nodes displayed in the snapin 
! 		/// this collection "owns" them and assignes cookie values
  		/// </summary>
! 		protected HybridDictionary _nodes = new HybridDictionary(8);
  
  		///////////////////////////////////////////////////////////////////////
  		//
! 		// Private vars
  		//
  		#region
***************
*** 50,103 ****
  		/// We only want to see one Manager per Snapin
  		/// </summary>
! 		protected bool showSnapinManager = true;
  
  		/// <summary>
  		/// Contained object that implements IComponent on our behalf
  		/// </summary>
! 		protected Component m_Component = null;
! 
! 		/// <summary>
! 		/// A cached reference to the MMC console 
! 		/// </summary>
! 		protected IConsole2 m_Console = null;
! 
! 		/// <summary>
! 		/// A cached reference to the MMC console namespace 
! 		/// </summary>
! 		protected IConsoleNameSpace2 m_ConsoleNameSpace = null; 
! 
! 		/// <summary>
! 		/// Master list of all Nodes displayed in the snapin 
! 		/// this collection "owns" them and assignes cookie values
! 		/// </summary>
! 		//protected ArrayList m_Nodes = new ArrayList(16);				
! 		protected HybridDictionary m_Nodes = new HybridDictionary(8);
! 
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		protected int m_NodeId = 0;
! 
! 		/// <summary>
! 		/// The scope node that is currently selected for this snapin. This is needed
! 		/// for component.cs which goes through hoops to get the currently selected
! 		/// ScopeNode.
! 		/// </summary>
! 		protected BaseNode m_currentScopeNode;
! 
! 		/// <summary>
! 		/// global images collection 
! 		/// </summary>
! 		protected ImageList m_Images = new ImageList();
! 
! 		/// <summary>
! 		/// Used for both ScopeNodeSelected and SelectedScopeNodes Property
! 		/// </summary>
! 		protected BaseNode m_selectedNodes = null;
  
! 		/// <summary>
! 		/// Represents the window handle that the control is bound to.
! 		/// </summary>
! 		protected IntPtr m_Handle;
  		#endregion
  
--- 51,70 ----
  		/// We only want to see one Manager per Snapin
  		/// </summary>
! 		private bool _showSnapinManager = true;
  
  		/// <summary>
  		/// Contained object that implements IComponent on our behalf
  		/// </summary>
! 		private Component _component = null;
  
! 		private IConsole2 _console = null;
! 		private IConsoleNameSpace2 _consoleNameSpace = null; 
! 		private int _nodeId = 0;
! 		private BaseNode _currentScopeNode;
! 		private ImageList _images = new ImageList();
! 		private BaseNode _selectedNodes = null;
! 		private IntPtr _handle;
! 		private System.Windows.Forms.ContextMenu _filterMenu;
! 		private static ResourceManager _translator;
  		#endregion
  
***************
*** 109,113 ****
  		// Added by MAM
  		/// <summary>
! 		/// The scope node that is currently selected for this snapin. This is needed
  		/// for component.cs which goes through hoops to get the currently selected
  		/// ScopeNode.
--- 76,80 ----
  		// Added by MAM
  		/// <summary>
! 		/// Get or set the scope node that is currently selected for this snapin. This is needed
  		/// for component.cs which goes through hoops to get the currently selected
  		/// ScopeNode.
***************
*** 115,138 ****
  		public BaseNode CurrentScopeNode 
  		{
! 			get { return m_currentScopeNode; }
! 			set { m_currentScopeNode = value; }
  		}
  
  		//Added by Alexander Kachalkov
  		/// <summary>
! 		/// Global images collection
  		/// Using it from Component class while creating Toolbar.
  		/// </summary>
  		public ImageList Images
  		{
! 			get { return m_Images; }
  		}
  
  		/// <summary>
! 		/// Is there currently a scope node selected?
  		/// </summary>
  		public virtual bool ScopeNodeSelected 
  		{
! 			get { return m_selectedNodes != null; }
  		}
  
--- 82,105 ----
  		public BaseNode CurrentScopeNode 
  		{
! 			get { return _currentScopeNode; }
! 			set { _currentScopeNode = value; }
  		}
  
  		//Added by Alexander Kachalkov
  		/// <summary>
! 		/// returns global images collection
  		/// Using it from Component class while creating Toolbar.
  		/// </summary>
  		public ImageList Images
  		{
! 			get { return _images; }
  		}
  
  		/// <summary>
! 		/// Returns if there is a scope node selected
  		/// </summary>
  		public virtual bool ScopeNodeSelected 
  		{
! 			get { return _selectedNodes != null; }
  		}
  
***************
*** 142,150 ****
  		public virtual BaseNode SelectedScopeNodes 
  		{
! 			get { return this.m_selectedNodes; }
  		}
  
  		/// <summary>
! 		/// Is there currently a view-item selected?
  		/// </summary>
  		public virtual bool ViewItemSelected 
--- 109,117 ----
  		public virtual BaseNode SelectedScopeNodes 
  		{
! 			get { return _selectedNodes; }
  		}
  
  		/// <summary>
! 		/// returns if there is a view-item selected
  		/// </summary>
  		public virtual bool ViewItemSelected 
***************
*** 152,156 ****
  			get 
  			{
! 				ReportNode rne = m_currentScopeNode as ReportNode;
  				if(rne != null) 
  				{		
--- 119,123 ----
  			get 
  			{
! 				ReportNode rne = _currentScopeNode as ReportNode;
  				if(rne != null) 
  				{		
***************
*** 170,174 ****
  		public virtual BaseNode LastSelectedScopeNode 
  		{
! 			get { return this.m_currentScopeNode; }
  		}
  
--- 137,141 ----
  		public virtual BaseNode LastSelectedScopeNode 
  		{
! 			get { return _currentScopeNode; }
  		}
  
***************
*** 185,189 ****
  			{ 
  				ArrayList retval = new ArrayList();
! 				ReportNode rne = m_currentScopeNode as ReportNode;
  				if(rne != null) 
  					return rne.GetCurrentSelected();
--- 152,156 ----
  			{ 
  				ArrayList retval = new ArrayList();
! 				ReportNode rne = _currentScopeNode as ReportNode;
  				if(rne != null) 
  					return rne.GetCurrentSelected();
***************
*** 194,203 ****
  	
  		/// <summary>
! 		/// The window handle property
  		/// </summary>
  		public IntPtr SnapinHandle
  		{
! 			get {return m_Handle;}
  		}
  		#endregion
  
--- 161,180 ----
  	
  		/// <summary>
! 		/// returns the window handle that the control is bound to.
  		/// </summary>
  		public IntPtr SnapinHandle
  		{
! 			get {return _handle;}
! 		}
! 
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		public System.Windows.Forms.ContextMenu FilterMenu
! 		{
! 			get { return _filterMenu; }
! 			set { _filterMenu = value; }
  		}
+ 
  		#endregion
  
***************
*** 208,216 ****
  		internal void AddSelectedNode(BaseNode bn) 
  		{
! 			this.m_currentScopeNode = bn;
! 
! 			this.m_selectedNodes = bn;
  
! 			System.Diagnostics.Debug.WriteLine("SnapinBaseExt::addSelectedNode - " + bn.DisplayName);			
  		}
  
--- 185,191 ----
  		internal void AddSelectedNode(BaseNode bn) 
  		{
! 			_currentScopeNode = bn;
  
! 			_selectedNodes = bn;		
  		}
  
***************
*** 221,226 ****
  		internal void RemoveSelectedNode(BaseNode bn) 
  		{
! 			this.m_selectedNodes = null;
! 			System.Diagnostics.Debug.WriteLine("SnapinBaseExt::removeSelectedNode - " + bn.DisplayName);
  		}
  
--- 196,211 ----
  		internal void RemoveSelectedNode(BaseNode bn) 
  		{
! 			_selectedNodes = null;
! 		}
! 
! 		/// <summary>
! 		/// Static function to help with internationalisation
! 		/// </summary>
! 		internal static string Translate(string key)
! 		{
! 			if(_translator == null)
! 				_translator = new ResourceManager("Ironring.MMC.Resources.i18n",
! 					System.Reflection.Assembly.GetExecutingAssembly());
! 			return _translator.GetString(key);
  		}
  
***************
*** 236,241 ****
  		{
  			InitializeComponent();
!  			// Get the window handle and keep it alive, as long as the MMC is.
!  			m_Handle = Handle;
  			this.SnapinState = CreateSnapinState();
  			System.Diagnostics.Debug.WriteLine("Snapin<init>");
--- 221,226 ----
  		{
  			InitializeComponent();
! 			// Get the window handle and keep it alive, as long as the MMC is.
! 			_handle = Handle;
  			this.SnapinState = CreateSnapinState();
  			System.Diagnostics.Debug.WriteLine("Snapin<init>");
***************
*** 265,270 ****
  		public BaseNode RootNode
  		{
! 			get { return (BaseNode)m_Nodes[0]; }
! 			set { m_Nodes[0] = value; }
  		}
  
--- 250,255 ----
  		public BaseNode RootNode
  		{
! 			get { return (BaseNode)_nodes[0]; }
! 			set { _nodes[0] = value; }
  		}
  
***************
*** 274,278 ****
  		public IConsole2 ResultViewConsole
  		{
! 			get { return m_Component.Console; }
  		}
  
--- 259,263 ----
  		public IConsole2 ResultViewConsole
  		{
! 			get { return _component.Console; }
  		}
  
***************
*** 282,286 ****
  		public IConsole2 Console
  		{
! 			get { return m_Console; }
  		}
  
--- 267,271 ----
  		public IConsole2 Console
  		{
! 			get { return _console; }
  		}
  
***************
*** 290,294 ****
  		public IConsoleNameSpace2 ConsoleNameSpace
  		{
! 			get { return m_ConsoleNameSpace; }
  		}
  
--- 275,279 ----
  		public IConsoleNameSpace2 ConsoleNameSpace
  		{
! 			get { return _consoleNameSpace; }
  		}
  
***************
*** 298,302 ****
  		public IHeaderCtrl2 HeaderCtrl
  		{
! 			get { return (IHeaderCtrl2)m_Console; }
  		}
  
--- 283,287 ----
  		public IHeaderCtrl2 HeaderCtrl
  		{
! 			get { return (IHeaderCtrl2)_console; }
  		}
  
***************
*** 306,312 ****
  		/// </summary>
  		/// <param name="ResultData"></param>
! 		public virtual RESULTDATAITEM GetSelectedItem(IResultData ResultData)
  		{
! 			return GetSelectedItem(ResultData, -1);	// nIndex == -1 to start at first item
  		}
  
--- 291,297 ----
  		/// </summary>
  		/// <param name="ResultData"></param>
! 		public virtual RESULTDATAITEM GetSelectedItem(IResultData resultData)
  		{
! 			return GetSelectedItem(resultData, -1);	// nIndex == -1 to start at first item
  		}
  
***************
*** 316,320 ****
  		/// <param name="ResultData"></param>
  		/// <param name="nIndex"></param>
! 		public virtual RESULTDATAITEM GetSelectedItem(IResultData ResultData, int nIndex)
  		{
  			RESULTDATAITEM rdi = new RESULTDATAITEM();
--- 301,305 ----
  		/// <param name="ResultData"></param>
  		/// <param name="nIndex"></param>
! 		public virtual RESULTDATAITEM GetSelectedItem(IResultData resultData, int nIndex)
  		{
  			RESULTDATAITEM rdi = new RESULTDATAITEM();
***************
*** 327,331 ****
  			try
  			{
! 				ResultData.GetNextItem(ref rdi);
  			}
  			catch(Exception)
--- 312,316 ----
  			try
  			{
! 				resultData.GetNextItem(ref rdi);
  			}
  			catch(Exception)
***************
*** 335,339 ****
  				// I think it's because nothing is selected yet
  				// that's why we catch the exception and won't handle it
!                 // maybe it's better to return null
  			}
  			//out
--- 320,324 ----
  				// I think it's because nothing is selected yet
  				// that's why we catch the exception and won't handle it
! 				// maybe it's better to return null
  			}
  			//out
***************
*** 350,354 ****
  			// so mask off this word to get the "real" cookie.
  			int cleanCookie = cookie & 0xffff;
! 			BaseNode node = (BaseNode)m_Nodes[cleanCookie];
  			if (node == null)
  				throw new SnapinException("Failed to find Node with cookie " + cleanCookie.ToString());
--- 335,339 ----
  			// so mask off this word to get the "real" cookie.
  			int cleanCookie = cookie & 0xffff;
! 			BaseNode node = (BaseNode)_nodes[cleanCookie];
  			if (node == null)
  				throw new SnapinException("Failed to find Node with cookie " + cleanCookie.ToString());
***************
*** 362,370 ****
  		/// <param name="HScopeID"></param>
  		/// <returns></returns>
! 		public BaseNode FindNodeByHScope(int HScopeID)
  		{
! 			foreach(BaseNode node in m_Nodes.Values)
  			{
! 				if (node.HScopeItem == HScopeID)
  					return node;
  			}
--- 347,355 ----
  		/// <param name="HScopeID"></param>
  		/// <returns></returns>
! 		public BaseNode FindNodeByHScope(int hScopeID)
  		{
! 			foreach(BaseNode node in _nodes.Values)
  			{
! 				if (node.HScopeItem == hScopeID)
  					return node;
  			}
***************
*** 384,390 ****
  			// We may change the collection strategy in the future if we need to 
  			// support bigger node sets.
! 			int id = m_NodeId;
! 			m_Nodes.Add(id, newNode);
! 			m_NodeId++;
  			return id;
  		}
--- 369,375 ----
  			// We may change the collection strategy in the future if we need to 
  			// support bigger node sets.
! 			int id = _nodeId;
! 			_nodes.Add(id, newNode);
! 			_nodeId++;
  			return id;
  		}
***************
*** 395,400 ****
  		/// </summary>
  		/// <param name="node"></param>
! 		public void Unregister(BaseNode node){
! 			m_Nodes.Remove(node.Cookie);
  			//Added by Alexander Ovchinnikov
  			node.RemovePropertySheet( );
--- 380,386 ----
  		/// </summary>
  		/// <param name="node"></param>
! 		public void Unregister(BaseNode node)
! 		{
! 			_nodes.Remove(node.Cookie);
  			//Added by Alexander Ovchinnikov
  			node.RemovePropertySheet( );
***************
*** 408,412 ****
  		public int AddImage(string iconResourceName)
  		{
! 			return m_Images.Add(iconResourceName);
  		}
  		
--- 394,398 ----
  		public int AddImage(string iconResourceName)
  		{
! 			return _images.Add(iconResourceName);
  		}
  		
***************
*** 421,425 ****
  		public int AddImage(string iconResourceName, Color transparentColor)
  		{
! 			return m_Images.Add(iconResourceName, transparentColor);
  		}
  
--- 407,411 ----
  		public int AddImage(string iconResourceName, Color transparentColor)
  		{
! 			return _images.Add(iconResourceName, transparentColor);
  		}
  
***************
*** 430,434 ****
  		public int AddImage(Icon icon)
  		{
! 			return m_Images.Add(icon);
  		}
  		#endregion
--- 416,420 ----
  		public int AddImage(Icon icon)
  		{
! 			return _images.Add(icon);
  		}
  		#endregion
***************
*** 447,463 ****
  			{
  				// cache references to MMC interfaces
! 				m_Console = (IConsole2)pUnknown;
! 				m_ConsoleNameSpace = (IConsoleNameSpace2)pUnknown;
  
  				// alow startup init for each node
! 				foreach(BaseNode node in m_Nodes.Values)
  					node.Initialize();
  
  				// Now we'll add the images we need for the snapin
  				IImageList il = null;
! 				m_Console.QueryScopeImageList(out il);
              
  				// add the snapin - global images to the scope pane
! 				m_Images.LoadImageList(il);
  
  				// forward to the root node to see if any nodes care to add their node specific 
--- 433,449 ----
  			{
  				// cache references to MMC interfaces
! 				_console = (IConsole2)pUnknown;
! 				_consoleNameSpace = (IConsoleNameSpace2)pUnknown;
  
  				// alow startup init for each node
! 				foreach(BaseNode node in _nodes.Values)
  					node.Initialize();
  
  				// Now we'll add the images we need for the snapin
  				IImageList il = null;
! 				_console.QueryScopeImageList(out il);
              
  				// add the snapin - global images to the scope pane
! 				_images.LoadImageList(il);
  
  				// forward to the root node to see if any nodes care to add their node specific 
***************
*** 481,488 ****
  		{
  			// Make sure we don't already have a component created
! 			if (m_Component == null)
! 				m_Component = new Component(this);
  
! 			ppComponent = m_Component;
  		}
  
--- 467,474 ----
  		{
  			// Make sure we don't already have a component created
! 			if (_component == null)
! 				_component = new Component(this);
  
! 			ppComponent = _component;
  		}
  
***************
*** 513,519 ****
  				switch(notify)
  				{
! 					// If a data item is expanding, we need to tell MMC about it's children.
! 					// Note, this case doesn't necessarily mean the data item is expanding
! 					// visually.... MMC is just requesting information about it.
  					case MMCN_Notify.EXPAND:
  					{
--- 499,505 ----
  				switch(notify)
  				{
! 						// If a data item is expanding, we need to tell MMC about it's children.
! 						// Note, this case doesn't necessarily mean the data item is expanding
! 						// visually.... MMC is just requesting information about it.
  					case MMCN_Notify.EXPAND:
  					{
***************
*** 530,534 ****
  						break;
  					}
! 					//---added by Roman Kiss
  					case MMCN_Notify.DELETE:
  					{
--- 516,520 ----
  						break;
  					}
! 						//---added by Roman Kiss
  					case MMCN_Notify.DELETE:
  					{
***************
*** 536,540 ****
  						break;
  					}
! 					//Added by Alexander Kachalkov
  					case MMCN_Notify.BTN_CLICK:
  					{
--- 522,526 ----
  						break;
  					}
! 						//Added by Alexander Kachalkov
  					case MMCN_Notify.BTN_CLICK:
  					{
***************
*** 544,548 ****
  						break;
  					}
! 					//Added by Alexander Kachalkov
  					case MMCN_Notify.RENAME:
  					{
--- 530,534 ----
  						break;
  					}
! 						//Added by Alexander Kachalkov
  					case MMCN_Notify.RENAME:
  					{
***************
*** 598,615 ****
  		}
  
!         /// <summary>
!         /// The IComponentData::QueryDataObject method returns a data object that can be used to retrieve 
!         /// the context information for the specified cookie.
!         /// </summary>
!         /// <param name="cookie">Specifies the unique identifier for which the data object is required.</param>
!         /// <param name="type">Specifies the data object as one of the members of the CCT enum</param>
!         /// <param name="ppDataObject">Pointer to the address of the returned data object</param>
!         public virtual void QueryDataObject(int cookie, uint type, out IDataObject ppDataObject)
  		{
! 			if(type == (uint)CCT.SNAPIN_MANAGER && showSnapinManager)
  			{
  				System.Diagnostics.Debug.WriteLine("Asks for Snapin Manager in SnapinBase");
  				// false so that it doesn't show up again
! 				showSnapinManager = false;
  				this.ShowInitialisationWizard();
  			}
--- 584,601 ----
  		}
  
! 		/// <summary>
! 		/// The IComponentData::QueryDataObject method returns a data object that can be used to retrieve 
! 		/// the context information for the specified cookie.
! 		/// </summary>
! 		/// <param name="cookie">Specifies the unique identifier for which the data object is required.</param>
! 		/// <param name="type">Specifies the data object as one of the members of the CCT enum</param>
! 		/// <param name="ppDataObject">Pointer to the address of the returned data object</param>
! 		public virtual void QueryDataObject(int cookie, uint type, out IDataObject ppDataObject)
  		{
! 			if(type == (uint)CCT.SNAPIN_MANAGER && _showSnapinManager)
  			{
  				System.Diagnostics.Debug.WriteLine("Asks for Snapin Manager in SnapinBase");
  				// false so that it doesn't show up again
! 				_showSnapinManager = false;
  				this.ShowInitialisationWizard();
  			}
***************
*** 835,838 ****
--- 821,851 ----
  			}
  		}
+ 
+ 		//		FIXME: http://sourceforge.net/tracker/index.php?func=detail&aid=832805&group_id=93348&atid=604010
+ 		//		public void AddMenuItems(IntPtr iDataObject, IContextMenuCallback piCallback, ref int pInsertionAllowed)
+ 		//		{
+ 		//			if (iDataObject == (IntPtr) DataObject.CUSTOMOCX || iDataObject == (IntPtr)DataObject.CUSTOMWEB)
+ 		//			{
+ 		//			}
+ 		//			else
+ 		//			{
+ 		//
+ 		//				IDataObject piDataObject = (IDataObject)Marshal.GetObjectForIUnknown(iDataObject);
+ 		//				
+ 		//				// The piDataObject is really a DataObject is disguise....
+ 		//				
+ 		//				DataObject item = (DataObject)piDataObject;
+ 		//				
+ 		//				if (item.Node != null)
+ 		//					item.Node.AddMenuItems(piCallback, ref pInsertionAllowed);
+ 		//			}
+ 		//		}
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  		/// <summary>
  		/// Called when user invokes a menu command
***************
*** 904,908 ****
  		/// </summary>
  		protected SnapinStateBase m_SnapinState;
! 		public virtual SnapinStateBase SnapinState {
  			get { return this.m_SnapinState; }
  			set { this.m_SnapinState = value; }
--- 917,922 ----
  		/// </summary>
  		protected SnapinStateBase m_SnapinState;
! 		public virtual SnapinStateBase SnapinState 
! 		{
  			get { return this.m_SnapinState; }
  			set { this.m_SnapinState = value; }
***************
*** 916,920 ****
  		/// </summary>
  		/// <returns></returns>
! 		public virtual SnapinStateBase CreateSnapinState() {
  			SnapinStateBase ssb = new SnapinStateBase();
  			return ssb;
--- 930,935 ----
  		/// </summary>
  		/// <returns></returns>
! 		public virtual SnapinStateBase CreateSnapinState() 
! 		{
  			SnapinStateBase ssb = new SnapinStateBase();
  			return ssb;
***************
*** 925,929 ****
  		/// </summary>
  		/// <param name="pClassID"></param>
! 		public void GetClassID(out Guid pClassID) {			
  			System.Diagnostics.Debug.WriteLine("GetClassID");
  			pClassID = this.Guid;
--- 940,945 ----
  		/// </summary>
  		/// <param name="pClassID"></param>
! 		public void GetClassID(out Guid pClassID) 
! 		{			
  			System.Diagnostics.Debug.WriteLine("GetClassID");
  			pClassID = this.Guid;
***************
*** 934,946 ****
  		/// </summary>
  		/// <returns></returns>
! 		public int IsDirty( ) {
  			System.Diagnostics.Debug.WriteLine("IsDirty");
! 			if(this.SnapinState != null) {
! 				if(this.SnapinState.Dirty) {
  					return 0;
! 				} else {
  					return 1;
  				}
! 			} else {
  				return 1;
  			}
--- 950,969 ----
  		/// </summary>
  		/// <returns></returns>
! 		public int IsDirty( ) 
! 		{
  			System.Diagnostics.Debug.WriteLine("IsDirty");
! 			if(this.SnapinState != null) 
! 			{
! 				if(this.SnapinState.Dirty) 
! 				{
  					return 0;
! 				} 
! 				else 
! 				{
  					return 1;
  				}
! 			} 
! 			else 
! 			{
  				return 1;
  			}
***************
*** 951,957 ****
  		/// </summary>
  		/// <param name="pStm"></param>
!         public void Load(UCOMIStream pStm)
!         {
!             try {
  				System.Diagnostics.Debug.WriteLine("Load");
  				ComStream cs = new ComStream(pStm);
--- 974,981 ----
  		/// </summary>
  		/// <param name="pStm"></param>
! 		public void Load(UCOMIStream pStm)
! 		{
! 			try 
! 			{
  				System.Diagnostics.Debug.WriteLine("Load");
  				ComStream cs = new ComStream(pStm);
***************
*** 960,964 ****
  				System.Diagnostics.Debug.WriteLine("Loaded state: " + this.SnapinState);				
  			}
! 			catch(Exception e) {
  				System.Diagnostics.Debug.WriteLine("Exception in load: " + e);
  				ceh.OnThreadException(this, new ThreadExceptionEventArgs(e));
--- 984,989 ----
  				System.Diagnostics.Debug.WriteLine("Loaded state: " + this.SnapinState);				
  			}
! 			catch(Exception e) 
! 			{
  				System.Diagnostics.Debug.WriteLine("Exception in load: " + e);
  				ceh.OnThreadException(this, new ThreadExceptionEventArgs(e));
***************
*** 971,977 ****
  		/// <param name="pStm"></param>
  		/// <param name="fClearDirty"></param>
!         public void Save(UCOMIStream pStm, [In, MarshalAs(UnmanagedType.Bool)] bool fClearDirty)
!         {
!             try {
  				System.Diagnostics.Debug.WriteLine("Save");				
  				ComStream cs = new ComStream(pStm);
--- 996,1003 ----
  		/// <param name="pStm"></param>
  		/// <param name="fClearDirty"></param>
! 		public void Save(UCOMIStream pStm, [In, MarshalAs(UnmanagedType.Bool)] bool fClearDirty)
! 		{
! 			try 
! 			{
  				System.Diagnostics.Debug.WriteLine("Save");				
  				ComStream cs = new ComStream(pStm);
***************
*** 979,983 ****
  				cs.Close();
  			}
! 			catch(Exception e) {
  				System.Diagnostics.Debug.WriteLine("Got an exception" + e + " stack " + e.StackTrace);	
  				ceh.OnThreadException(this, new ThreadExceptionEventArgs(e));
--- 1005,1010 ----
  				cs.Close();
  			}
! 			catch(Exception e) 
! 			{
  				System.Diagnostics.Debug.WriteLine("Got an exception" + e + " stack " + e.StackTrace);	
  				ceh.OnThreadException(this, new ThreadExceptionEventArgs(e));
***************
*** 992,998 ****
  		/// </summary>
  		/// <param name="pcbSize"></param>
! 		public void GetSizeMax(out long pcbSize) {
  			System.Diagnostics.Debug.WriteLine("GetSizeMax");
! 			throw new Exception("MMC didn't use to call GetSizeMax. Implement this.");
  		}
  
--- 1019,1026 ----
  		/// </summary>
  		/// <param name="pcbSize"></param>
! 		public void GetSizeMax(out long pcbSize) 
! 		{
  			System.Diagnostics.Debug.WriteLine("GetSizeMax");
! 			throw new SnapinException("MMC didn't use to call GetSizeMax. Implement this.");
  		}
  
***************
*** 1004,1014 ****
  		/// </summary>
  		/// <returns></returns>
! 		public int InitNew() {
  			System.Diagnostics.Debug.WriteLine("InitNew");
! 			if(this.SnapinState == null) {
  				System.Diagnostics.Debug.WriteLine("No previous state");
  				this.SnapinState = CreateSnapinState();
  				return 0;
! 			} else {
  				System.Diagnostics.Debug.WriteLine("Previous state found. Die!");
  				Marshal.ThrowExceptionForHR(unchecked((int)0x8000FFFF));
--- 1032,1046 ----
  		/// </summary>
  		/// <returns></returns>
! 		public int InitNew() 
! 		{
  			System.Diagnostics.Debug.WriteLine("InitNew");
! 			if(this.SnapinState == null) 
! 			{
  				System.Diagnostics.Debug.WriteLine("No previous state");
  				this.SnapinState = CreateSnapinState();
  				return 0;
! 			} 
! 			else 
! 			{
  				System.Diagnostics.Debug.WriteLine("Previous state found. Die!");
  				Marshal.ThrowExceptionForHR(unchecked((int)0x8000FFFF));
***************
*** 1019,1023 ****
  
  		//Added by Alexander Ovchinnikov
! 		internal void GetSelectedResultDataItem( ref RESULTDATAITEM rdi ){
  			rdi.mask	= (uint)RDI.STATE;		// nState is valid 
  			rdi.nCol	= 0;
--- 1051,1056 ----
  
  		//Added by Alexander Ovchinnikov
! 		internal void GetSelectedResultDataItem( ref RESULTDATAITEM rdi )
! 		{
  			rdi.mask	= (uint)RDI.STATE;		// nState is valid 
  			rdi.nCol	= 0;
***************
*** 1026,1030 ****
  
  			
! 			IResultData ResultData = m_Component.Console as IResultData;
  			ResultData.GetNextItem(ref rdi);
  		}	
--- 1059,1063 ----
  
  			
! 			IResultData ResultData = _component.Console as IResultData;
  			ResultData.GetNextItem(ref rdi);
  		}	

[Mmclibrary-cvs] mmclibrary/MMCLib2/Core MenuItem.cs,1.7,1.8

[Lesley v. Z. <ex...@us...>]

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

Modified Files:
	MenuItem.cs 
Log Message:
Changed a lot of protected variables that where storage for properties to private

Index: MenuItem.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Core/MenuItem.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MenuItem.cs	19 Oct 2004 20:49:05 -0000	1.7
--- MenuItem.cs	19 Jan 2005 22:34:53 -0000	1.8
***************
*** 21,68 ****
  		public event MenuCommandHandler Handler;
  
- 		//Added by Alexander Kachalkov
- 		/// <summary>
- 		/// Specifies one or more of the flags (see CCM_SPECIAL enum in interfaces.cs)
- 		/// </summary>
- 		private CCM_SPECIAL	_specialFlags = 0;
- 
- 		//Added by Alexander Kachalkov
- 		/// <summary>
- 		/// Specifies one or more of the style flags (see MF enum in interfaces.cs)
- 		/// </summary>
- 		private MF _flags = 0;
  
  		///////////////////////////////////////////////////////////////////////
  		//
! 		// Members
  		//
  		#region
  
- 		/// <summary>
- 		/// Unique identifier of this menu item.
- 		/// </summary>
- 		protected string m_ID;
- 
- 		/// <summary>
- 		/// Name can support mnemonics like &File
- 		/// </summary>
- 		protected string m_Name;
- 
- 		// added by Roman Kiss
- 		/// <summary>
- 		/// Flag to control visibility of the menu
- 		/// </summary>
- 		protected bool m_Visible = true;
- 
- 		/// <summary>
- 		/// Text to display in the MMC status bar when the user
- 		/// hovers over the menu item
- 		/// </summary>
- 		protected string m_StatusText;
- 
- 		/// <summary>
- 		/// The integer command that MMC uses when if fires the command
- 		/// </summary>
- 		protected int m_nCommandId = 0;
  		#endregion
  
--- 21,38 ----
  		public event MenuCommandHandler Handler;
  
  
  		///////////////////////////////////////////////////////////////////////
  		//
! 		// Private vars
  		//
  		#region
+ 		private CCM_SPECIAL	_specialFlags = 0;
+ 		private MF _flags = 0;
+ 		private string _id;
+ 		private string _name;
+ 		private bool _visible = true;
+ 		private string _statusText;
+ 		private int _nCommandId = 0;
  
  		#endregion
  
***************
*** 74,124 ****
  
  		/// <summary>
! 		/// The menu unique identifier.
  		/// </summary>
  		public string ID
  		{
! 			get{ return m_ID; }
! 			set{ m_ID = value; }
  		}
  
  		/// <summary>
! 		/// The menu display name
  		/// </summary>
  		public string Name
  		{
! 			get{ return m_Name; }
! 			set{ m_Name = value; }
  		}
  
  		/// <summary>
! 		/// added by Roman Kiss
! 		/// Flag to control visibility of the menu
  		/// </summary>
  		public bool Visible
  		{
! 			get{ return m_Visible; }
! 			set{ m_Visible = value; }
  		}
  
  		/// <summary>
! 		/// The silly status bar text
  		/// </summary>
  		public string StatusText
  		{
! 			get{ return m_StatusText; }
! 			set{ m_StatusText = value; }
  		}
  
  		/// <summary>
! 		///  the command Id
  		/// </summary>
  		public int CommandId
  		{
! 			get{ return m_nCommandId; }
! 			set{ m_nCommandId = value; }
  		}
  
  		/// <summary>
! 		/// Specifies one or more of the flags (see CCM_SPECIAL enum in interfaces.cs)
  		/// </summary>
  		public CCM_SPECIAL SpecialFlags
--- 44,95 ----
  
  		/// <summary>
! 		/// Get or set the unique identifier of this menu item.
  		/// </summary>
  		public string ID
  		{
! 			get{ return _id; }
! 			set{ _id = value; }
  		}
  
  		/// <summary>
! 		/// Get or set the menu display name
! 		/// Name can support mnemonics like &File
  		/// </summary>
  		public string Name
  		{
! 			get{ return _name; }
! 			set{ _name = value; }
  		}
  
+ 		// added by Roman Kiss
  		/// <summary>
! 		/// Get or set the flag to control visibility of the menu
  		/// </summary>
  		public bool Visible
  		{
! 			get{ return _visible; }
! 			set{ _visible = value; }
  		}
  
  		/// <summary>
! 		/// Get or set the text to display in the MMC status bar when the user hovers over the menu item
  		/// </summary>
  		public string StatusText
  		{
! 			get{ return _statusText; }
! 			set{ _statusText = value; }
  		}
  
  		/// <summary>
! 		/// Get or set the integer command that MMC uses when if fires the command
  		/// </summary>
  		public int CommandId
  		{
! 			get{ return _nCommandId; }
! 			set{ _nCommandId = value; }
  		}
  
  		/// <summary>
! 		/// Get or set one or more of the flags (see CCM_SPECIAL enum in interfaces.cs)
  		/// </summary>
  		public CCM_SPECIAL SpecialFlags
***************
*** 129,133 ****
  
  		/// <summary>
! 		/// Specifies one or more of the style flags (see MF enum in interfaces.cs)
  		/// </summary>
   		public MF Flags
--- 100,104 ----
  
  		/// <summary>
! 		/// Get or set one or more of the style flags (see MF enum in interfaces.cs)
  		/// </summary>
   		public MF Flags
***************
*** 158,163 ****
  		public MenuItem(string name, string statusText, MenuCommandHandler handler)
  		{
! 			m_Name = name;
! 			m_StatusText = statusText;
  			Handler += handler;
  		}
--- 129,134 ----
  		public MenuItem(string name, string statusText, MenuCommandHandler handler)
  		{
! 			this.Name = name;
! 			this.StatusText = statusText;
  			Handler += handler;
  		}
***************
*** 179,183 ****
  		public MenuItem(string id, string name, string statusText, MenuCommandHandler handler) : this(name,statusText,handler)
  		{
! 			m_ID = id;
  		}
  
--- 150,154 ----
  		public MenuItem(string id, string name, string statusText, MenuCommandHandler handler) : this(name,statusText,handler)
  		{
! 			this.ID = id;
  		}
  

[Mmclibrary-cvs] mmclibrary/MMCLib2/Core ImageList.cs,1.5,1.6

[Lesley v. Z. <ex...@us...>]

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

Modified Files:
	ImageList.cs 
Log Message:
Changed a lot of protected variables that where storage for properties to private

Index: ImageList.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Core/ImageList.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ImageList.cs	7 Nov 2004 14:44:36 -0000	1.5
--- ImageList.cs	19 Jan 2005 22:30:40 -0000	1.6
***************
*** 44,56 ****
  	   /// hold transparent color
  	   /// </summary>
! 	   private static Color _TransparentColor;
  
  	   /// <summary>
! 	   /// get/set the Transparent Color of the new bitmap
  	   /// </summary>
  	   public static Color TransparentColor
  	   {
! 		   get { return _TransparentColor; }
! 		   set { _TransparentColor = value; }
  	   }
  		
--- 44,56 ----
  	   /// hold transparent color
  	   /// </summary>
! 	   private static Color _transparentColor;
  
  	   /// <summary>
! 	   /// get or set the Transparent Color of the new bitmap
  	   /// </summary>
  	   public static Color TransparentColor
  	   {
! 		   get { return _transparentColor; }
! 		   set { _transparentColor = value; }
  	   }
  		
***************
*** 87,96 ****
        }
  
! 	   // MAM: added image caching. Sometimes icons get corrupted and the
! 	   // MMC slows down considerably without it.
! 	   /// <summary>
! 	   /// Image cache.
! 	   /// </summary>
! 	   protected Hashtable LoadedImages = new Hashtable();
  
        /*CSF****************************************************************************************
--- 87,91 ----
        }
  
! 	   private Hashtable _loadedImages = new Hashtable();
  
        /*CSF****************************************************************************************
***************
*** 182,190 ****
  				//Checking if the color differ from default Transparent color
  				//Otherwise set it
! 				if	(_TransparentColor == Color.Transparent) return new Bitmap(s);
  				else
  				{
  					Bitmap bmp = new Bitmap(s);
! 					bmp.MakeTransparent(_TransparentColor);
  					return bmp;
  				}
--- 177,185 ----
  				//Checking if the color differ from default Transparent color
  				//Otherwise set it
! 				if	(_transparentColor == Color.Transparent) return new Bitmap(s);
  				else
  				{
  					Bitmap bmp = new Bitmap(s);
! 					bmp.MakeTransparent(_transparentColor);
  					return bmp;
  				}
***************
*** 405,409 ****
        /// <param name="image">Specifies the image to be appended.
        /// </param>
!       public override int Add(object image)
        {
           return base.Add(new ImageEntry(image));
--- 400,404 ----
        /// <param name="image">Specifies the image to be appended.
        /// </param>
!       [Obsolete]public override int Add(object image)
        {
           return base.Add(new ImageEntry(image));
***************
*** 428,436 ****
        {
  		  // MAM: note: we don't flush the cache yet.
! 		  if(this.LoadedImages.ContainsKey(name)) {
! 			  return (int)this.LoadedImages[name];
  		  } else {
  			  int retval = base.Add(new ImageEntry(FindImage(name)));
! 			  this.LoadedImages.Add(name, retval);
  			  return retval;
  		  }         
--- 423,431 ----
        {
  		  // MAM: note: we don't flush the cache yet.
! 		  if(_loadedImages.ContainsKey(name)) {
! 			  return (int)_loadedImages[name];
  		  } else {
  			  int retval = base.Add(new ImageEntry(FindImage(name)));
! 			  _loadedImages.Add(name, retval);
  			  return retval;
  		  }         
***************
*** 455,459 ****
  	   public virtual int Add(string name, Color transparentColor)
  	   {
! 		   _TransparentColor = transparentColor;
  		   return base.Add(new ImageEntry(FindImage(name)));
  	   }
--- 450,454 ----
  	   public virtual int Add(string name, Color transparentColor)
  	   {
! 		   _transparentColor = transparentColor;
  		   return base.Add(new ImageEntry(FindImage(name)));
  	   }

[Mmclibrary-cvs] mmclibrary/MMCLib2/Core ExceptionHandler.cs,1.3,1.4

[Lesley v. Z. <ex...@us...>]

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

Modified Files:
	ExceptionHandler.cs 
Log Message:
Added i18n support

Index: ExceptionHandler.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Core/ExceptionHandler.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ExceptionHandler.cs	21 Jul 2004 15:16:22 -0000	1.3
--- ExceptionHandler.cs	19 Jan 2005 22:28:04 -0000	1.4
***************
*** 29,33 ****
  				try
  				{
! 					MessageBox.Show("Fatal Error", "Fatal Error", MessageBoxButtons.AbortRetryIgnore, MessageBoxIcon.Stop);
  				}
  				finally
--- 29,34 ----
  				try
  				{
! 					string error = SnapinBase.Translate("FatalError");
! 					MessageBox.Show(error, error, MessageBoxButtons.AbortRetryIgnore, MessageBoxIcon.Stop);
  				}
  				finally
***************
*** 49,55 ****
   		private static DialogResult ShowThreadExceptionDialog(Exception e) 
  		{
! 			string errorMsg = "An error occurred please contact the administrator with the following information:\n\n";
! 			errorMsg = errorMsg + e.Message + "\n\nStack Trace:\n" + e.StackTrace;
! 			return MessageBox.Show(errorMsg, "Application Error", MessageBoxButtons.AbortRetryIgnore, MessageBoxIcon.Stop);
  		}
  	}
--- 50,58 ----
   		private static DialogResult ShowThreadExceptionDialog(Exception e) 
  		{
! 			string sStack = SnapinBase.Translate("StackTrace");
! 			string errorTitle = SnapinBase.Translate("ApplicationError");
! 			string errorMsg = SnapinBase.Translate("CehErrorInfo") + "\n\n";
! 			errorMsg = errorMsg + e.Message + "\n\n" + sStack + ":\n" + e.StackTrace;
! 			return MessageBox.Show(errorMsg, errorTitle, MessageBoxButtons.AbortRetryIgnore, MessageBoxIcon.Stop);
  		}
  	}

[Mmclibrary-cvs] mmclibrary/MMCLib2/Core EventHandlerSet.cs,1.4,1.5

[Lesley v. Z. <ex...@us...>]

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

Modified Files:
	EventHandlerSet.cs 
Log Message:
changed a comment line

Index: EventHandlerSet.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Core/EventHandlerSet.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EventHandlerSet.cs	22 Jul 2004 14:07:04 -0000	1.4
--- EventHandlerSet.cs	19 Jan 2005 22:23:46 -0000	1.5
***************
*** 24,28 ****
  		#region
          /// <summary>
!         /// get and set events in the set
          /// </summary>
          public virtual Delegate this[object eventKey]
--- 24,28 ----
  		#region
          /// <summary>
!         /// get or set events in the set
          /// </summary>
          public virtual Delegate this[object eventKey]

[Mmclibrary-cvs] mmclibrary/MMCLib2/Core ComStream.cs,1.3,1.4

[Lesley v. Z. <ex...@us...>]

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

Modified Files:
	ComStream.cs 
Log Message:
Changed a lot of protected variables that where storage for properties to private

Index: ComStream.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Core/ComStream.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ComStream.cs	22 Jul 2004 14:07:04 -0000	1.3
--- ComStream.cs	19 Jan 2005 22:21:15 -0000	1.4
***************
*** 15,23 ****
  		protected int m_writeCount = 0;
  
! 		protected UCOMIStream m_comStream;
  		public UCOMIStream comStream 
  		{
! 			get { return m_comStream; }
! 			set { m_comStream = value; }
  		}
  	
--- 15,23 ----
  		protected int m_writeCount = 0;
  
! 		private UCOMIStream _comStream;
  		public UCOMIStream comStream 
  		{
! 			get { return _comStream; }
! 			set { _comStream = value; }
  		}
  	
***************
*** 38,42 ****
  		
  		/// <summary>
! 		/// Always return true
  		/// </summary>
  		public override bool CanRead 
--- 38,42 ----
  		
  		/// <summary>
! 		/// Always returns true
  		/// </summary>
  		public override bool CanRead 

[Mmclibrary-cvs] mmclibrary/MMCLib2/Core Component.cs,1.17,1.18

[Lesley v. Z. <ex...@us...>]

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

Modified Files:
	Component.cs 
Log Message:
Method parameter names should use a camel case for their names
Changed a lot of protected variables that where storage for properties to private

Index: Component.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Core/Component.cs,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Component.cs	20 Oct 2004 14:32:05 -0000	1.17
--- Component.cs	19 Jan 2005 22:18:45 -0000	1.18
***************
*** 10,60 ****
  {
  	/// <summary>
!     ///  Component implements the IComponent, IExtendContextMenu and IExtendControlbar
!     ///  interfaces that control the result view side of the MMC control.  
!     ///  Many event notifications pass through this class on the way to the node
!     /// </summary>
  	public class Component : IComponent, IExtendContextMenu, IExtendControlbar, IExtendPropertySheet
  	{
- 		//////////////////////////////////////////////////////////////
- 		//
[...2345 lines suppressed...]
! 			if(_snapin.QueryPagesFor(lpDataObject) == (int)HRESULT.S_OK)
  				return HRESULT.S_OK;
  
***************
*** 1351,1357 ****
  			try
  			{
! 				if (m_Snapin.CurrentScopeNode != null)
  				{
! 					BaseNode node = (m_Snapin.CurrentScopeNode as BaseNode);
  					if (node != null)
  					{
--- 1335,1341 ----
  			try
  			{
! 				if (_snapin.CurrentScopeNode != null)
  				{
! 					BaseNode node = (_snapin.CurrentScopeNode as BaseNode);
  					if (node != null)
  					{

[Mmclibrary-cvs] mmclibrary/MMCLib2/Core About.cs,1.7,1.8

[Lesley v. Z. <ex...@us...>]

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

Modified Files:
	About.cs 
Log Message:
Method parameter names should use a camel case for their names
Changed a lot of protected variables that where storage for properties to private

Index: About.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Core/About.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** About.cs	12 Nov 2004 16:20:36 -0000	1.7
--- About.cs	19 Jan 2005 22:12:07 -0000	1.8
***************
*** 21,24 ****
--- 21,30 ----
          private ImageList staticFolderIcons = new ImageList();
  
+ 		///////////////////////////////////////////////////////////////////////
+ 		//
+ 		// private vars
+ 		//
+ 		#region
+ 
          /// <summary>
          /// This following indices are used to access the icons in the staticFolderIcons list.
***************
*** 29,80 ****
          private const int largeImageIndex = 3;
  
!         ///////////////////////////////////////////////////////////////////////
!         //
!         // Members
!         //
!         #region
!         /// <summary>
!         /// A long description of the snapin
!         /// </summary>
!         protected string m_Description;
! 
!         /// <summary>
!         /// the organization providing the snapin 
!         /// </summary>
!         protected string m_Provider;
! 
!         /// <summary>
!         /// the version of the snapin: TBD: tie this to the assembly version? 
!         /// </summary>
!         protected string m_Version;
! 
!         /// <summary>
!         /// embedded image name for main icon
!         /// </summary>
!         protected string m_MainIconName;
! 
!         /// <summary>
!         /// embedded image name for main icon
!         /// </summary>
!         protected string m_SmallOpenName;
! 
!         /// <summary>
!         /// embedded image name for Small Open image
!         /// </summary>
!         protected string m_SmallClosedName;
! 
!         /// <summary>
!         /// embedded image name for small closed image
!         /// </summary>
!         protected string m_LargeName;
  
!         /// <summary>
!         /// RGB color value describing the transparent color
!         /// The color mask is important when the color depth of the screen is not 32.
!         /// In this case, the unmanaged bitmaps must be translated to the color depth
!         /// of the screen and the color mask should specify Color.Black
!         /// </summary>
!         protected Color m_Mask;
!         #endregion
  
          ///////////////////////////////////////////////////////////////////////
--- 35,48 ----
          private const int largeImageIndex = 3;
  
! 		private string _description;
!         private string _provider;
!         private string _version;
!         private string _mainIconName;
!         private string _smallOpenName;
!         private string _smallClosedName;
!         private string _largeImageName;
!         private Color _mask;
  
! 		#endregion
  
          ///////////////////////////////////////////////////////////////////////
***************
*** 83,149 ****
          //
          #region
!         /// <summary>
!         /// Get or set the description
!         /// </summary>
          public string Description
          {
!             get { return m_Description; }
!             set { m_Description = value; }
          }
  
!         /// <summary>
!         /// Get or set the provider
!         /// </summary>
          public string Provider
          {
!             get { return m_Provider; }
!             set { m_Provider = value; }
          }
  
!         /// <summary>
!         /// Get or set the version
!         /// </summary>
          public string Version
          {
!             get { return m_Version; }
!             set { m_Version = value; }
          }
  
!         /// <summary>
!         /// Get or set the main icon name
!         /// </summary>
          public string MainIconName
          {
!             get { return m_MainIconName; }
              set
              {
!                 m_MainIconName = value;
!                 staticFolderIcons.Replace(mainIconIndex, m_MainIconName);
              }
          }
  
!         /// <summary>
!         /// Get or set the small open image name
!         /// </summary>
          public string SmallOpenImageName
          {
!             get { return m_SmallOpenName; }
              set
              {
!                 m_SmallOpenName = value;
!                 staticFolderIcons.Replace(smallOpenImageIndex, m_SmallOpenName);
              }
          }
  
!         /// <summary>
!         /// Get or set the small closed image name
!         /// </summary>
          public string SmallClosedImageName
          {
!             get { return m_SmallClosedName; }
              set
              {
!                 m_SmallClosedName = value;
!                 staticFolderIcons.Replace(smallClosedImageIndex, m_SmallClosedName);
              }
          }
--- 51,117 ----
          //
          #region
! 		/// <summary>
! 		/// Get or set a long description of the snapin
! 		/// </summary>
          public string Description
          {
!             get { return _description; }
!             set { _description = value; }
          }
  
! 		/// <summary>
! 		/// Get or set the organization providing the snapin 
! 		/// </summary>
          public string Provider
          {
!             get { return _provider; }
!             set { _provider = value; }
          }
  
! 		/// <summary>
! 		/// Get or set the version of the snapin: TBD: tie this to the assembly version? 
! 		/// </summary>
          public string Version
          {
!             get { return _version; }
!             set { _version = value; }
          }
  
! 		/// <summary>
! 		/// Get or set embedded image name for main icon
! 		/// </summary>
          public string MainIconName
          {
!             get { return _mainIconName; }
              set
              {
!                 _mainIconName = value;
!                 staticFolderIcons.Replace(mainIconIndex, _mainIconName);
              }
          }
  
! 		/// <summary>
! 		/// Get or set embedded image name for Small Open image
! 		/// </summary>
          public string SmallOpenImageName
          {
!             get { return _smallOpenName; }
              set
              {
!                 _smallOpenName = value;
!                 staticFolderIcons.Replace(smallOpenImageIndex, _smallOpenName);
              }
          }
  
! 		/// <summary>
! 		/// Get or set embedded image name for small closed image
! 		/// </summary>
          public string SmallClosedImageName
          {
!             get { return _smallClosedName; }
              set
              {
!                 _smallClosedName = value;
!                 staticFolderIcons.Replace(smallClosedImageIndex, _smallClosedName);
              }
          }
***************
*** 154,172 ****
          public string LargeImageName
          {
!             get { return m_LargeName; }
              set
              {
!                 m_LargeName = value;
!                 staticFolderIcons.Replace(largeImageIndex, m_LargeName);
              }
          }
  
!         /// <summary>
!         /// Get or set the image color mask
!         /// </summary>
          public Color ImageColorMask
          {
!             get { return m_Mask; }
!             set { m_Mask = value; }
          }
          #endregion
--- 122,143 ----
          public string LargeImageName
          {
!             get { return _largeImageName; }
              set
              {
!                 _largeImageName = value;
!                 staticFolderIcons.Replace(largeImageIndex, _largeImageName);
              }
          }
  
! 		/// <summary>
! 		/// RGB color value describing the transparent color
! 		/// The color mask is important when the color depth of the screen is not 32.
! 		/// In this case, the unmanaged bitmaps must be translated to the color depth
! 		/// of the screen and the color mask should specify Color.Black
! 		/// </summary>
          public Color ImageColorMask
          {
!             get { return _mask; }
!             set { _mask = value; }
          }
          #endregion
***************
*** 189,197 ****
                  SnapinInAttribute snapinAttrib = (SnapinInAttribute)attrs[0];
  
!                 m_Provider = GetProviderFromAtr(snapinAttrib);
!                 m_Version = GetVersionFromAtr(snapinAttrib);
              }
  
!             m_Mask = Color.Black;
  
              InsertStaticFolderIcons();
--- 160,168 ----
                  SnapinInAttribute snapinAttrib = (SnapinInAttribute)attrs[0];
  
!                 Provider = GetProviderFromAtr(snapinAttrib);
!                 Version = GetVersionFromAtr(snapinAttrib);
              }
  
!             ImageColorMask = Color.Black;
  
              InsertStaticFolderIcons();
***************
*** 287,291 ****
              hSmallImageOpen = staticFolderIcons.GetBitmapHandle(smallOpenImageIndex);
              hLargeImage = staticFolderIcons.GetBitmapHandle(largeImageIndex);
!             cMask = (uint)m_Mask.ToArgb();
          }
          #endregion
--- 258,262 ----
              hSmallImageOpen = staticFolderIcons.GetBitmapHandle(smallOpenImageIndex);
              hLargeImage = staticFolderIcons.GetBitmapHandle(largeImageIndex);
!             cMask = (uint)ImageColorMask.ToArgb();
          }
          #endregion

[Mmclibrary-cvs] mmclibrary/MMCLib2 Interfaces.cs,1.6,1.7

[Lesley v. Z. <ex...@us...>]

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

Modified Files:
	Interfaces.cs 
Log Message:
Method parameter names should use a camel case for their names

Index: Interfaces.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Interfaces.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Interfaces.cs	7 Nov 2004 14:44:36 -0000	1.6
--- Interfaces.cs	19 Jan 2005 22:07:34 -0000	1.7
***************
*** 59,63 ****
  		void Destroy();
  		void QueryDataObject(int cookie, uint type, out IDataObject ppDataObject);
! 		void GetDisplayInfo(ref SCOPEDATAITEM ResultDataItem);
  		[PreserveSig()]
  		int CompareObjects(IDataObject lpDataObjectA, IDataObject lpDataObjectB);
--- 59,63 ----
  		void Destroy();
  		void QueryDataObject(int cookie, uint type, out IDataObject ppDataObject);
! 		void GetDisplayInfo(ref SCOPEDATAITEM resultDataItem);
  		[PreserveSig()]
  		int CompareObjects(IDataObject lpDataObjectA, IDataObject lpDataObjectB);
***************
*** 78,82 ****
  		[PreserveSig()]
  		int GetResultViewType(int cookie, out IntPtr ppViewType, out int pViewOptions);
! 		void GetDisplayInfo(ref RESULTDATAITEM ResultDataItem);
  		[PreserveSig()]
  		int CompareObjects(IDataObject lpDataObjectA, IDataObject lpDataObjectB);
--- 78,82 ----
  		[PreserveSig()]
  		int GetResultViewType(int cookie, out IntPtr ppViewType, out int pViewOptions);
! 		void GetDisplayInfo(ref RESULTDATAITEM resultDataItem);
  		[PreserveSig()]
  		int CompareObjects(IDataObject lpDataObjectA, IDataObject lpDataObjectB);
***************
*** 231,235 ****
  		void UpdateItem(uint itemID);
  		void Sort(int nColumn, uint dwSortOptions, int lUserParam);
! 		void SetDescBarText([MarshalAs(System.Runtime.InteropServices.UnmanagedType.LPWStr)] String DescText);
  		void SetItemCount(int nItemCount, uint dwOptions);
  	}
--- 231,235 ----
  		void UpdateItem(uint itemID);
  		void Sort(int nColumn, uint dwSortOptions, int lUserParam);
! 		void SetDescBarText([MarshalAs(System.Runtime.InteropServices.UnmanagedType.LPWStr)] String descText);
  		void SetItemCount(int nItemCount, uint dwOptions);
  	}

[Mmclibrary-cvs] mmclibrary/MMCFormsShim MMCFormsShimCtrl.cpp,1.3,1.4 MMCFormsShimCtrl.h,1.3,1.4

[Lesley v. Z. <ex...@us...>]

Update of /cvsroot/mmclibrary/mmclibrary/MMCFormsShim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5119

Modified Files:
	MMCFormsShimCtrl.cpp MMCFormsShimCtrl.h 
Log Message:
VK_ENTER is now passed through to the usercontrol

Index: MMCFormsShimCtrl.h
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCFormsShim/MMCFormsShimCtrl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MMCFormsShimCtrl.h	16 Jan 2005 15:56:16 -0000	1.3
--- MMCFormsShimCtrl.h	17 Jan 2005 15:05:49 -0000	1.4
***************
*** 137,140 ****
--- 137,148 ----
  	STDMETHOD(RehostUserControl)(IUnknown *pControlObject);
  
+ 	virtual BOOL PreTranslateAccelerator(LPMSG pMsg, HRESULT& hRet);
+ 	STDMETHOD(TranslateAccelerator)(LPMSG pMsg);
+ 
+ 	STDMETHOD(get_FormClassName)(BSTR* pVal);
+ 	STDMETHOD(put_FormClassName)(BSTR newVal);
+ 	STDMETHOD(get_AssemblyName)(BSTR* pVal);
+ 	STDMETHOD(put_AssemblyName)(BSTR newVal);
+ 
  
  protected:
***************
*** 142,156 ****
  	CComPtr<ICorRuntimeHost>			m_pHost;
  	CComPtr<mscorlib::_AppDomain>		m_pDefaultDomain;
! 	CComVariant							   m_varFormDisp;
! 	HWND								      m_hWndForm;
  
  	CComBSTR							m_bstrAssemblyName;		// path to the assemply to load
  	CComBSTR							m_bstrClass;	// class name of the form
  
! public:
! 	STDMETHOD(get_FormClassName)(BSTR* pVal);
! 	STDMETHOD(put_FormClassName)(BSTR newVal);
! 	STDMETHOD(get_AssemblyName)(BSTR* pVal);
! 	STDMETHOD(put_AssemblyName)(BSTR newVal);
  };
  
--- 150,162 ----
  	CComPtr<ICorRuntimeHost>			m_pHost;
  	CComPtr<mscorlib::_AppDomain>		m_pDefaultDomain;
! 	CComVariant							m_varFormDisp;
! 	HWND								m_hWndForm;
! 
! 	CComPtr<IUnknown>					m_pUserControl;
  
  	CComBSTR							m_bstrAssemblyName;		// path to the assemply to load
  	CComBSTR							m_bstrClass;	// class name of the form
  
! 
  };
  

Index: MMCFormsShimCtrl.cpp
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCFormsShim/MMCFormsShimCtrl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MMCFormsShimCtrl.cpp	16 Jan 2005 15:57:21 -0000	1.3
--- MMCFormsShimCtrl.cpp	17 Jan 2005 15:05:49 -0000	1.4
***************
*** 44,48 ****
  
  /****
! * If we haven't already connected the hosted control, do it when the shim is shown.
  ***/
  LRESULT CMMCFormsShimCtrl::OnShowWindow(UINT, WPARAM, LPARAM, BOOL&)
--- 44,48 ----
  
  /****
! * connect to the host when the shim is shown.
  ***/
  LRESULT CMMCFormsShimCtrl::OnShowWindow(UINT, WPARAM, LPARAM, BOOL&)
***************
*** 50,59 ****
  	// Inititalize a COM interface pointer
  	CComPtr<IUnknown> pUnk;
- 	//	Reset();
  
! 	// FIXME MyVSUSerControlHostCtl is far cleaner
! 	// if the hosted control isn't connected, do it now
  	if (m_bstrAssemblyName.Length() && m_bstrClass.Length())
  		HRESULT hr = HostUserControl(m_bstrAssemblyName, m_bstrClass, &pUnk);
  	return 0;
  }
--- 50,61 ----
  	// Inititalize a COM interface pointer
  	CComPtr<IUnknown> pUnk;
  
! 	// connect to the host
  	if (m_bstrAssemblyName.Length() && m_bstrClass.Length())
  		HRESULT hr = HostUserControl(m_bstrAssemblyName, m_bstrClass, &pUnk);
+ 
+ 	// store a pointer to the usercontrol interface
+ 	m_pUserControl = pUnk;
+ 
  	return 0;
  }
***************
*** 71,77 ****
  	::MoveWindow(m_hWndForm, 0, 0, wLength, wHeight, TRUE);
  
! 	// FIXME lying ?
! 	// claim we didn't handle it (?)
! 	bHandled = FALSE;
  
  	return 0;
--- 73,78 ----
  	::MoveWindow(m_hWndForm, 0, 0, wLength, wHeight, TRUE);
  
! 	// we handled it
! 	bHandled = true;
  
  	return 0;
***************
*** 87,90 ****
--- 88,92 ----
  	m_varFormDisp.Clear();
  	m_hWndForm = NULL;
+ 	m_pUserControl = NULL;
  }
  
***************
*** 197,200 ****
--- 199,228 ----
  	return hr;
  }
+ 
+ BOOL CMMCFormsShimCtrl::PreTranslateAccelerator(LPMSG pMsg, HRESULT& hRet)
+ {
+ 	if(pMsg->message == WM_KEYDOWN)
+ 	{
+ 		switch(LOWORD(pMsg->wParam))
+ 		{
+ 		case VK_RETURN:
+ 			return ::SendMessage(m_hWndForm, pMsg->message, pMsg->wParam, pMsg->lParam) == 1;
+ 		}
+ 	}
+ 	return CComCompositeControl<CMMCFormsShimCtrl>::PreTranslateAccelerator(pMsg, hRet);
+ } 
+ 
+ // The TranslateAccelerator method is proxied thru to the UserControl 
+ //  using its IOleInPlaceActiveObject interface
+ HRESULT CMMCFormsShimCtrl::TranslateAccelerator(LPMSG pMsg)
+ {
+ 	CComPtr<IOleInPlaceActiveObject> pIPAO;
+ 	if(m_pUserControl && m_pUserControl->QueryInterface(__uuidof(IOleInPlaceActiveObject), (LPVOID*)&pIPAO) == S_OK && (pIPAO.p))
+ 		if(pIPAO->TranslateAccelerator(pMsg) == S_OK) 
+ 			return S_OK;
+ 
+ 	return IOleInPlaceActiveObjectImpl<CMMCFormsShimCtrl>::TranslateAccelerator(pMsg);
+ }
+ 
  STDMETHODIMP CMMCFormsShimCtrl::get_FormClassName(BSTR* pVal)
  {

[Mmclibrary-cvs] mmclibrary/MMCFormsShim MMCFormsShimCtrl.cpp,1.2,1.3

[Lesley v. Z. <ex...@us...>]

Update of /cvsroot/mmclibrary/mmclibrary/MMCFormsShim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv962

Modified Files:
	MMCFormsShimCtrl.cpp 
Log Message:
trying to understand and improve the formsshim code

lots of comments added

Index: MMCFormsShimCtrl.cpp
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCFormsShim/MMCFormsShimCtrl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MMCFormsShimCtrl.cpp	19 Oct 2004 16:46:38 -0000	1.2
--- MMCFormsShimCtrl.cpp	16 Jan 2005 15:57:21 -0000	1.3
***************
*** 7,24 ****
  // CMMCFormsShimCtrl
  
  HRESULT CMMCFormsShimCtrl::FinalConstruct()
  {
!    Reset();
  
  	CComPtr<IUnknown> pAppDomainPunk;
  	HRESULT hr = CorBindToRuntimeEx(NULL, NULL, STARTUP_LOADER_OPTIMIZATION_SINGLE_DOMAIN | STARTUP_CONCURRENT_GC, __uuidof(CorRuntimeHost), __uuidof(ICorRuntimeHost), (LPVOID*)&m_pHost);
  	if(FAILED(hr))
  		return hr;
  	hr = m_pHost->Start();
  	if(FAILED(hr))
  		return hr;
  	hr = m_pHost->GetDefaultDomain(&pAppDomainPunk);
  	if(FAILED(hr) || !pAppDomainPunk)
  		return hr;
  	hr = pAppDomainPunk->QueryInterface(__uuidof(mscorlib::_AppDomain), (LPVOID*)&m_pDefaultDomain);
  	if(FAILED(hr) || !m_pDefaultDomain)
--- 7,39 ----
  // CMMCFormsShimCtrl
  
+ /****
+ * this method is called immediately after constructing the CMMCFormsShimCtrl object
+ * We use it so that we can retrieve a status afterwards (return value)
+ ***/
  HRESULT CMMCFormsShimCtrl::FinalConstruct()
  {
! 	// FIXME move to a constructor
! 	// Do stuff we should be doing in a constructor
! 	Reset();
  
+ 	// Inititalize a COM interface pointer
  	CComPtr<IUnknown> pAppDomainPunk;
+ 
+ 	// make sure this can host the CLR
  	HRESULT hr = CorBindToRuntimeEx(NULL, NULL, STARTUP_LOADER_OPTIMIZATION_SINGLE_DOMAIN | STARTUP_CONCURRENT_GC, __uuidof(CorRuntimeHost), __uuidof(ICorRuntimeHost), (LPVOID*)&m_pHost);
  	if(FAILED(hr))
  		return hr;
+ 
+ 	// I guess that if we can't start it we won't be able to do the next steps at all
  	hr = m_pHost->Start();
  	if(FAILED(hr))
  		return hr;
+ 
+ 	// get the default domain as a IUnknown if able
  	hr = m_pHost->GetDefaultDomain(&pAppDomainPunk);
  	if(FAILED(hr) || !pAppDomainPunk)
  		return hr;
+ 
+ 	// try to 'cast' the IUnkown to a Application Domain
  	hr = pAppDomainPunk->QueryInterface(__uuidof(mscorlib::_AppDomain), (LPVOID*)&m_pDefaultDomain);
  	if(FAILED(hr) || !m_pDefaultDomain)
***************
*** 28,53 ****
  }	
  
! 
! 
  LRESULT CMMCFormsShimCtrl::OnShowWindow(UINT, WPARAM, LPARAM, BOOL&)
  {
  	CComPtr<IUnknown> pUnk;
! //	Reset();
! //	FinalConstruct();
!    if (m_bstrAssemblyName.Length() && m_bstrClass.Length())
! 	   HRESULT hr = HostUserControl(m_bstrAssemblyName, m_bstrClass, &pUnk);
  	return 0;
  }
  
  LRESULT CMMCFormsShimCtrl::OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& bHandled)
  {
  	WORD wLength = LOWORD(lParam);
  	WORD wHeight = HIWORD(lParam);
  	::MoveWindow(m_hWndForm, 0, 0, wLength, wHeight, TRUE);
  	bHandled = FALSE;
  	return 0;
  }
  
! 
  void CMMCFormsShimCtrl::Reset()
  {
--- 43,84 ----
  }	
  
! /****
! * If we haven't already connected the hosted control, do it when the shim is shown.
! ***/
  LRESULT CMMCFormsShimCtrl::OnShowWindow(UINT, WPARAM, LPARAM, BOOL&)
  {
+ 	// Inititalize a COM interface pointer
  	CComPtr<IUnknown> pUnk;
! 	//	Reset();
! 
! 	// FIXME MyVSUSerControlHostCtl is far cleaner
! 	// if the hosted control isn't connected, do it now
! 	if (m_bstrAssemblyName.Length() && m_bstrClass.Length())
! 		HRESULT hr = HostUserControl(m_bstrAssemblyName, m_bstrClass, &pUnk);
  	return 0;
  }
  
+ /****
+ * When the shim is resized, resize the hosted user control.
+ ***/
  LRESULT CMMCFormsShimCtrl::OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& bHandled)
  {
+ 	// retrieve the Length and Heigth from lParam
  	WORD wLength = LOWORD(lParam);
  	WORD wHeight = HIWORD(lParam);
+ 
+ 	// move the window to the new location
  	::MoveWindow(m_hWndForm, 0, 0, wLength, wHeight, TRUE);
+ 
+ 	// FIXME lying ?
+ 	// claim we didn't handle it (?)
  	bHandled = FALSE;
+ 
  	return 0;
  }
  
! /****
! * Reset certain variables back to constructing status
! ***/
  void CMMCFormsShimCtrl::Reset()
  {
***************
*** 58,115 ****
  }
  
  
  
! HRESULT CMMCFormsShimCtrl::HostUserControl(BSTR Assembly, BSTR Class, IUnknown **ppControlObject)
! {
!    HRESULT hr = S_OK;
  
!    if (m_hWndForm == NULL)
!    {
!       CComPtr<mscorlib::_Assembly> pAssembly;
  
! 	   RECT rc;
! 	   CComPtr<IWin32Window> pIWin32Window;
! 	   hr = m_pDefaultDomain->Load_2(Assembly, &pAssembly);
! 	   if(FAILED(hr) || (!pAssembly))
! 	   {
! 			hr = E_FAIL;
  			Reset();
  			return hr;
! 	   }
  
!        hr = pAssembly->CreateInstance(Class, &m_varFormDisp);
! 	   if((m_varFormDisp.vt != VT_DISPATCH) && (m_varFormDisp.vt != VT_UNKNOWN) || (!m_varFormDisp.punkVal))
! 	   {
! 		   hr = E_FAIL;
! 		   Reset();
! 		   return hr;
! 	   }
! 	   hr = m_varFormDisp.pdispVal->QueryInterface(IID_IUnknown, (LPVOID*)ppControlObject);
! 	   hr = m_varFormDisp.pdispVal->QueryInterface(IID_IWin32Window, (LPVOID*)&pIWin32Window);
! 	   if(FAILED(hr))
! 	   {
! 		   Reset();
! 		   return hr;
! 	   }
!       
!       long nWndForm = 0;
! 	   hr = pIWin32Window->get_Handle(&nWndForm);
! 	   if(FAILED(hr) || !nWndForm)
! 	   {
! 		   Reset();
! 		   return hr;
! 	   }
  
  #pragma warning (push)
  #pragma warning (disable : 4312)
!        m_hWndForm = (HWND)nWndForm;
  #pragma warning (pop)
  
  
!       // parent the form window returned and move it into position
! 	   ::SetParent(m_hWndForm, m_hWnd);
! 	   ::GetWindowRect(m_hWnd, &rc);
! 	   ::MoveWindow(m_hWndForm, 0, 0, rc.right-rc.left, rc.bottom-rc.top, TRUE);
!    }
  
  	return hr;
--- 89,159 ----
  }
  
+ /****
+  * this the important function that we use in the mmclib to host a control on a formnode.
+  * first we try to create an instance of the CLASS type and test if we can do anything with it
+  * after that we parent the form window returned and move it into position
+  ***/
+  HRESULT CMMCFormsShimCtrl::HostUserControl(BSTR Assembly, BSTR Class, IUnknown **ppControlObject)
+ {
+ 	HRESULT hr = S_OK;
  
+ 	// only proceed if our window handler is set
+ 	if (m_hWndForm == NULL)
+ 	{
+ 		CComPtr<mscorlib::_Assembly> pAssembly;
+ 		CComPtr<IWin32Window> pIWin32Window;
  
! 		// trying to lead a default domain (?)
! 		hr = m_pDefaultDomain->Load_2(Assembly, &pAssembly);
! 		if(FAILED(hr) || (!pAssembly))
! 		{
! 			Reset();
! 			return E_FAIL;
! 		}
  
! 		// try to create an Class instance and store it
! 		hr = pAssembly->CreateInstance(Class, &m_varFormDisp);
! 		
! 		// if the punkVal is either NULL or the VARIANT isn't a IUnknown Interface and doesn't implement IDispatch
! 		// it won't succeed and we return a failure status.
! 		if((m_varFormDisp.vt != VT_DISPATCH) && (m_varFormDisp.vt != VT_UNKNOWN) || (!m_varFormDisp.punkVal))
! 		{
! 			Reset();
! 			return E_FAIL;
! 		}
  
! 		// try to do some interface 'cast' magic
! 		hr = m_varFormDisp.pdispVal->QueryInterface(IID_IUnknown, (LPVOID*)ppControlObject);
! 		hr = m_varFormDisp.pdispVal->QueryInterface(IID_IWin32Window, (LPVOID*)&pIWin32Window);
! 		if(FAILED(hr))
! 		{
  			Reset();
  			return hr;
! 		}
  
! 		// try to get a windowhandle to the form
! 		long nWndForm = 0;
! 		hr = pIWin32Window->get_Handle(&nWndForm);
! 		if(FAILED(hr) || !nWndForm)
! 		{
! 			Reset();
! 			return hr;
! 		}
  
+ // 'type cast' : conversion from 'long' to 'HWND' of greater size
  #pragma warning (push)
  #pragma warning (disable : 4312)
! 		m_hWndForm = (HWND)nWndForm;
  #pragma warning (pop)
  
  
! 		// parent the form window returned
! 		::SetParent(m_hWndForm, m_hWnd);
! 
! 		// move the window into position
! 		RECT rc;
! 		::GetWindowRect(m_hWnd, &rc);
! 		::MoveWindow(m_hWndForm, 0, 0, rc.right-rc.left, rc.bottom-rc.top, TRUE);
! 	}
  
  	return hr;
***************
*** 118,153 ****
  HRESULT CMMCFormsShimCtrl::RehostUserControl(IUnknown *pControlObject)
  {
!    HRESULT hr = S_OK;
  
!    if (m_hWndForm == NULL)
!    {
! 	   RECT rc;
! 	   CComPtr<IWin32Window> pIWin32Window;
! 	   hr = pControlObject->QueryInterface(IID_IWin32Window, (LPVOID*)&pIWin32Window);
! 	   if(FAILED(hr))
! 	   {
! 		   Reset();
! 		   return hr;
! 	   }
!       
!       long nWndForm = 0;
! 	   hr = pIWin32Window->get_Handle(&nWndForm);
! 	   if(FAILED(hr) || !nWndForm)
! 	   {
! 		   Reset();
! 		   return hr;
! 	   }
  
  #pragma warning (push)
  #pragma warning (disable : 4312)
!        m_hWndForm = (HWND)nWndForm;
  #pragma warning (pop)
  
  
!       // parent the form window returned and move it into position
! 	   ::SetParent(m_hWndForm, m_hWnd);
! 	   ::GetWindowRect(m_hWnd, &rc);
! 	   ::MoveWindow(m_hWndForm, 0, 0, rc.right-rc.left, rc.bottom-rc.top, TRUE);
!    }
  
  	return hr;
--- 162,197 ----
  HRESULT CMMCFormsShimCtrl::RehostUserControl(IUnknown *pControlObject)
  {
! 	HRESULT hr = S_OK;
  
! 	if (m_hWndForm == NULL)
! 	{
! 		RECT rc;
! 		CComPtr<IWin32Window> pIWin32Window;
! 		hr = pControlObject->QueryInterface(IID_IWin32Window, (LPVOID*)&pIWin32Window);
! 		if(FAILED(hr))
! 		{
! 			Reset();
! 			return hr;
! 		}
! 
! 		long nWndForm = 0;
! 		hr = pIWin32Window->get_Handle(&nWndForm);
! 		if(FAILED(hr) || !nWndForm)
! 		{
! 			Reset();
! 			return hr;
! 		}
  
  #pragma warning (push)
  #pragma warning (disable : 4312)
! 		m_hWndForm = (HWND)nWndForm;
  #pragma warning (pop)
  
  
! 		// parent the form window returned and move it into position
! 		::SetParent(m_hWndForm, m_hWnd);
! 		::GetWindowRect(m_hWnd, &rc);
! 		::MoveWindow(m_hWndForm, 0, 0, rc.right-rc.left, rc.bottom-rc.top, TRUE);
! 	}
  
  	return hr;

[Mmclibrary-cvs] mmclibrary/MMCFormsShim MMCFormsShimCtrl.h,1.2,1.3

[Lesley v. Z. <ex...@us...>]

Update of /cvsroot/mmclibrary/mmclibrary/MMCFormsShim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv666

Modified Files:
	MMCFormsShimCtrl.h 
Log Message:
trying to understand and improve the formshim code

only a comment line added

Index: MMCFormsShimCtrl.h
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCFormsShim/MMCFormsShimCtrl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MMCFormsShimCtrl.h	19 Oct 2004 16:46:38 -0000	1.2
--- MMCFormsShimCtrl.h	16 Jan 2005 15:56:16 -0000	1.3
***************
*** 155,157 ****
--- 155,158 ----
  };
  
+ // this line generates the control's self-registration and instantiation code
  OBJECT_ENTRY_AUTO(__uuidof(MMCFormsShimCtrl), CMMCFormsShimCtrl)

[Mmclibrary-cvs] mmclibrary/MMCTest2 MyFormNode.cs,1.7,1.8 TestNode.cs,1.1,1.2

[Lesley v. Z. <ex...@us...>]

Update of /cvsroot/mmclibrary/mmclibrary/MMCTest2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3974

Modified Files:
	MyFormNode.cs TestNode.cs 
Log Message:
adopt changes

Index: TestNode.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest2/TestNode.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestNode.cs	15 Nov 2004 19:47:24 -0000	1.1
--- TestNode.cs	5 Dec 2004 15:49:04 -0000	1.2
***************
*** 61,65 ****
  			node2.Remove(false);
  
! 			m_ChildNodes.Clear();
  
  			Snapin.SelectScopeNode(this);
--- 61,65 ----
  			node2.Remove(false);
  
! 			//m_ChildNodes.Clear();
  
  			Snapin.SelectScopeNode(this);

Index: MyFormNode.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest2/MyFormNode.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MyFormNode.cs	7 Nov 2004 14:45:32 -0000	1.7
--- MyFormNode.cs	5 Dec 2004 15:49:04 -0000	1.8
***************
*** 51,54 ****
--- 51,58 ----
  				ArrayList pages = new ArrayList();
  				pages.Add(new PropertyPage("PropertyPage", typeof(MyPropertyPage), this));
+ 				pages.Add(new PropertyPage("PropertyPage", typeof(MyPropertyPage), this));
+ 				pages.Add(new PropertyPage("PropertyPage", typeof(MyPropertyPage), this));
+ 				pages.Add(new PropertyPage("PropertyPage", typeof(MyPropertyPage), this));
+ 				pages.Add(new PropertyPage("PropertyPage", typeof(MyPropertyPage), this));
  				return pages;
  			}

[Mmclibrary-cvs] mmclibrary/MMCLib2/Nodes BaseNode.cs,1.27,1.28

[Lesley v. Z. <ex...@us...>]

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

Modified Files:
	BaseNode.cs 
Log Message:
Remove() removes itself out of the m_Children of it's parent.

Index: BaseNode.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/BaseNode.cs,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** BaseNode.cs	15 Nov 2004 19:42:27 -0000	1.27
--- BaseNode.cs	5 Dec 2004 15:47:16 -0000	1.28
***************
*** 899,902 ****
--- 899,905 ----
  			m_ChildNodes.Clear( );
  
+ 			if(this.Parent != null)
+ 				Parent.Children.Remove(this);
+ 
  			if (!removeChildrenOnly)
  			{

[Mmclibrary-cvs] mmclibrary/MMCLib2 MMCLib2.csproj,1.12,1.13

[Lesley v. Z. <ex...@us...>]

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

Modified Files:
	MMCLib2.csproj 
Log Message:
no message

Index: MMCLib2.csproj
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/MMCLib2.csproj,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** MMCLib2.csproj	22 Jul 2004 14:07:03 -0000	1.12
--- MMCLib2.csproj	5 Dec 2004 15:43:44 -0000	1.13
***************
*** 276,279 ****
--- 276,284 ----
                  />
                  <File
+                     RelPath = "PropertyPages\PropertyPageSettings.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "PropertyPages\PropertySheet.cs"
                      SubType = "Component"

[Mmclibrary-cvs] mmclibrary/MMCSetup MMCSetup.vdproj,1.2,1.3

[Alexander K. <kac...@us...>]

Update of /cvsroot/mmclibrary/mmclibrary/MMCSetup
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1197/MMCSetup

Modified Files:
	MMCSetup.vdproj 
Log Message:


Index: MMCSetup.vdproj
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCSetup/MMCSetup.vdproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MMCSetup.vdproj	23 Jan 2004 15:12:16 -0000	1.2
--- MMCSetup.vdproj	5 Dec 2004 15:33:12 -0000	1.3
***************
*** 16,19 ****
--- 16,25 ----
          "Entry"
          {
+         "MsmKey" = "8:_11F5841925659E8E000E429D0E79865F"
+         "OwnerKey" = "8:_367ED5CAA8A94A76A9DE182C2FE977A1"
+         "MsmSig" = "8:_UNDEFINED"
+         }
+         "Entry"
+         {
          "MsmKey" = "8:_367ED5CAA8A94A76A9DE182C2FE977A1"
          "OwnerKey" = "8:_UNDEFINED"
***************
*** 22,27 ****
          "Entry"
          {
!         "MsmKey" = "8:_39B1D2EF5AAB437BAC3149B849982364"
!         "OwnerKey" = "8:_UNDEFINED"
          "MsmSig" = "8:_UNDEFINED"
          }
--- 28,39 ----
          "Entry"
          {
!         "MsmKey" = "8:_457CA7C12781FD6582CECEA16E4FAEAA"
!         "OwnerKey" = "8:_6422F0CD578048EA834E8FCFF6DC65BD"
!         "MsmSig" = "8:_UNDEFINED"
!         }
!         "Entry"
!         {
!         "MsmKey" = "8:_457CA7C12781FD6582CECEA16E4FAEAA"
!         "OwnerKey" = "8:_F242AA10633E444392DCC0E0787530B4"
          "MsmSig" = "8:_UNDEFINED"
          }
***************
*** 34,38 ****
          "Entry"
          {
!         "MsmKey" = "8:_73B9F248034844408D96E9260E735576"
          "OwnerKey" = "8:_6422F0CD578048EA834E8FCFF6DC65BD"
          "MsmSig" = "8:_UNDEFINED"
--- 46,56 ----
          "Entry"
          {
!         "MsmKey" = "8:_808476A0E9179AB32C7EFA2068EC9540"
!         "OwnerKey" = "8:_F242AA10633E444392DCC0E0787530B4"
!         "MsmSig" = "8:_UNDEFINED"
!         }
!         "Entry"
!         {
!         "MsmKey" = "8:_8C576DA1DBE74B6F813CDF64598FB1F9"
          "OwnerKey" = "8:_6422F0CD578048EA834E8FCFF6DC65BD"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 40,44 ****
          "Entry"
          {
!         "MsmKey" = "8:_73B9F248034844408D96E9260E735576"
          "OwnerKey" = "8:_F242AA10633E444392DCC0E0787530B4"
          "MsmSig" = "8:_UNDEFINED"
--- 58,68 ----
          "Entry"
          {
!         "MsmKey" = "8:_8C576DA1DBE74B6F813CDF64598FB1F9"
!         "OwnerKey" = "8:_808476A0E9179AB32C7EFA2068EC9540"
!         "MsmSig" = "8:_UNDEFINED"
!         }
!         "Entry"
!         {
!         "MsmKey" = "8:_8C576DA1DBE74B6F813CDF64598FB1F9"
          "OwnerKey" = "8:_F242AA10633E444392DCC0E0787530B4"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 46,62 ****
          "Entry"
          {
!         "MsmKey" = "8:_73B9F248034844408D96E9260E735576"
!         "OwnerKey" = "8:_C40698BF74873FFC61E0D2EF3C146C61"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_73B9F248034844408D96E9260E735576"
!         "OwnerKey" = "8:_EB664674074C41C5A454E093E56DB20F"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_899AD24EDE397059FC8EBBAE8A111BFB"
          "OwnerKey" = "8:_6422F0CD578048EA834E8FCFF6DC65BD"
          "MsmSig" = "8:_UNDEFINED"
--- 70,86 ----
          "Entry"
          {
!         "MsmKey" = "8:_8C576DA1DBE74B6F813CDF64598FB1F9"
!         "OwnerKey" = "8:_E0E32D3EFB834F41A2FCBADDC3040524"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_8C576DA1DBE74B6F813CDF64598FB1F9"
!         "OwnerKey" = "8:_D6946C5DE97B6D11BA33803891FC8B7A"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_BDF78D5D7C69788B7DE034BBB8A6C1DB"
          "OwnerKey" = "8:_6422F0CD578048EA834E8FCFF6DC65BD"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 64,68 ****
          "Entry"
          {
!         "MsmKey" = "8:_899AD24EDE397059FC8EBBAE8A111BFB"
          "OwnerKey" = "8:_F242AA10633E444392DCC0E0787530B4"
          "MsmSig" = "8:_UNDEFINED"
--- 88,98 ----
          "Entry"
          {
!         "MsmKey" = "8:_BDF78D5D7C69788B7DE034BBB8A6C1DB"
!         "OwnerKey" = "8:_808476A0E9179AB32C7EFA2068EC9540"
!         "MsmSig" = "8:_UNDEFINED"
!         }
!         "Entry"
!         {
!         "MsmKey" = "8:_BDF78D5D7C69788B7DE034BBB8A6C1DB"
          "OwnerKey" = "8:_F242AA10633E444392DCC0E0787530B4"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 70,92 ****
          "Entry"
          {
!         "MsmKey" = "8:_8F37ACF7835AE93987A7C61848AC9D2A"
!         "OwnerKey" = "8:_367ED5CAA8A94A76A9DE182C2FE977A1"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_A0CE67D1A4E093BA815DFACD5CC2D05A"
!         "OwnerKey" = "8:_367ED5CAA8A94A76A9DE182C2FE977A1"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_B274E6F63B0576A0DDBD2ADF38870812"
!         "OwnerKey" = "8:_F242AA10633E444392DCC0E0787530B4"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_C40698BF74873FFC61E0D2EF3C146C61"
          "OwnerKey" = "8:_F242AA10633E444392DCC0E0787530B4"
          "MsmSig" = "8:_UNDEFINED"
--- 100,128 ----
          "Entry"
          {
!         "MsmKey" = "8:_C9D2B5BFB1CFCBA437794954A95C86FE"
!         "OwnerKey" = "8:_F242AA10633E444392DCC0E0787530B4"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_CB2754E5B1F232B15E23EF5598B347A4"
!         "OwnerKey" = "8:_D6946C5DE97B6D11BA33803891FC8B7A"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_D6946C5DE97B6D11BA33803891FC8B7A"
!         "OwnerKey" = "8:_6422F0CD578048EA834E8FCFF6DC65BD"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_D6946C5DE97B6D11BA33803891FC8B7A"
!         "OwnerKey" = "8:_808476A0E9179AB32C7EFA2068EC9540"
!         "MsmSig" = "8:_UNDEFINED"
!         }
!         "Entry"
!         {
!         "MsmKey" = "8:_D6946C5DE97B6D11BA33803891FC8B7A"
          "OwnerKey" = "8:_F242AA10633E444392DCC0E0787530B4"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 94,98 ****
          "Entry"
          {
!         "MsmKey" = "8:_EB664674074C41C5A454E093E56DB20F"
          "OwnerKey" = "8:_UNDEFINED"
          "MsmSig" = "8:_UNDEFINED"
--- 130,140 ----
          "Entry"
          {
!         "MsmKey" = "8:_DB7DBE3420047BCC61BE98116D66F05A"
!         "OwnerKey" = "8:_367ED5CAA8A94A76A9DE182C2FE977A1"
!         "MsmSig" = "8:_UNDEFINED"
!         }
!         "Entry"
!         {
!         "MsmKey" = "8:_E0E32D3EFB834F41A2FCBADDC3040524"
          "OwnerKey" = "8:_UNDEFINED"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 104,107 ****
--- 146,155 ----
          "MsmSig" = "8:_UNDEFINED"
          }
+         "Entry"
+         {
+         "MsmKey" = "8:_FF374E806197BEDD27C0151CBFDCB14F"
+         "OwnerKey" = "8:_367ED5CAA8A94A76A9DE182C2FE977A1"
+         "MsmSig" = "8:_UNDEFINED"
+         }
      }
      "Configurations"
***************
*** 112,116 ****
          "IsDebugOnly" = "11:TRUE"
          "IsReleaseOnly" = "11:FALSE"
!         "OutputFilename" = "8:Debug\\MMCSetup.msi"
          "PackageFilesAs" = "3:2"
          "PackageFileSize" = "3:-2147483648"
--- 160,164 ----
          "IsDebugOnly" = "11:TRUE"
          "IsReleaseOnly" = "11:FALSE"
!         "OutputFilename" = "8:..\\bin\\MMCSetup.msi"
          "PackageFilesAs" = "3:2"
          "PackageFileSize" = "3:-2147483648"
***************
*** 144,166 ****
          "CustomAction"
          {
!             "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_29D03A5EDB3441F0B3A0BFEC2873DE2E"
              {
              "Name" = "8:Primary output from InstallClassRegAsm (Active)"
              "Condition" = "8:"
!             "Object" = "8:_EB664674074C41C5A454E093E56DB20F"
              "FileType" = "3:1"
              "InstallAction" = "3:1"
              "Arguments" = "8:"
              "EntryPoint" = "8:"
!             "Sequence" = "3:2"
!             "Identifier" = "8:_F23D107D_97D0_4FB9_B9A1_C7DD302702B5"
              "InstallerClass" = "11:TRUE"
!             "CustomActionData" = "8:/name=\"[TARGETDIR]bin\\MMCTest.dll\""
              }
!             "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_3E6DCE9F45D54706B0E4326B241CDFFC"
              {
              "Name" = "8:Primary output from InstallClassRegAsm (Active)"
              "Condition" = "8:"
!             "Object" = "8:_EB664674074C41C5A454E093E56DB20F"
              "FileType" = "3:1"
              "InstallAction" = "3:4"
--- 192,214 ----
          "CustomAction"
          {
!             "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_66F33A32BC5E4E7A9A8B1B5777191AA4"
              {
              "Name" = "8:Primary output from InstallClassRegAsm (Active)"
              "Condition" = "8:"
!             "Object" = "8:_E0E32D3EFB834F41A2FCBADDC3040524"
              "FileType" = "3:1"
              "InstallAction" = "3:1"
              "Arguments" = "8:"
              "EntryPoint" = "8:"
!             "Sequence" = "3:3"
!             "Identifier" = "8:_B0C6A4CF_DAAD_4601_B06E_B46E1CF412EA"
              "InstallerClass" = "11:TRUE"
!             "CustomActionData" = "8:/name=\"[TARGETDIR]bin\\MMCLib.dll\""
              }
!             "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_6FD675F491784F929AB6AC8BCB8A6D69"
              {
              "Name" = "8:Primary output from InstallClassRegAsm (Active)"
              "Condition" = "8:"
!             "Object" = "8:_E0E32D3EFB834F41A2FCBADDC3040524"
              "FileType" = "3:1"
              "InstallAction" = "3:4"
***************
*** 168,228 ****
              "EntryPoint" = "8:"
              "Sequence" = "3:2"
!             "Identifier" = "8:_2CF60F61_F34D_484F_8577_742B93A64AA6"
              "InstallerClass" = "11:TRUE"
              "CustomActionData" = "8:/name=\"[TARGETDIR]bin\\MMCTest.dll\""
              }
!             "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_475A1A4F4CCA48C5A6ADF54A4F476C94"
              {
              "Name" = "8:Primary output from InstallClassRegAsm (Active)"
              "Condition" = "8:"
!             "Object" = "8:_EB664674074C41C5A454E093E56DB20F"
              "FileType" = "3:1"
              "InstallAction" = "3:1"
              "Arguments" = "8:"
              "EntryPoint" = "8:"
!             "Sequence" = "3:3"
!             "Identifier" = "8:_EC986252_7ADC_45AC_A888_F17C33D30F94"
              "InstallerClass" = "11:TRUE"
              "CustomActionData" = "8:/name=\"[TARGETDIR]bin\\MMCVBNET.dll\""
              }
!             "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_CD9E10514B02429785CF6EF368D145C5"
              {
              "Name" = "8:Primary output from InstallClassRegAsm (Active)"
              "Condition" = "8:"
!             "Object" = "8:_EB664674074C41C5A454E093E56DB20F"
              "FileType" = "3:1"
              "InstallAction" = "3:4"
              "Arguments" = "8:"
              "EntryPoint" = "8:"
!             "Sequence" = "3:3"
!             "Identifier" = "8:_3E6FD73F_E02A_4806_AB63_A605901820FA"
              "InstallerClass" = "11:TRUE"
              "CustomActionData" = "8:/name=\"[TARGETDIR]bin\\MMCVBNET.dll\""
              }
!             "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_E241642F273349CF818EB92614BCCF94"
              {
              "Name" = "8:Primary output from InstallClassRegAsm (Active)"
              "Condition" = "8:"
!             "Object" = "8:_EB664674074C41C5A454E093E56DB20F"
              "FileType" = "3:1"
!             "InstallAction" = "3:4"
              "Arguments" = "8:"
              "EntryPoint" = "8:"
!             "Sequence" = "3:1"
!             "Identifier" = "8:_2F30E473_3576_4BCA_B554_AF143C932A2D"
              "InstallerClass" = "11:TRUE"
!             "CustomActionData" = "8:/name=\"[TARGETDIR]bin\\MMCLib.dll\""
              }
!             "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_E82FEC2245194EFEA920F6179BDF5EB1"
              {
              "Name" = "8:Primary output from InstallClassRegAsm (Active)"
              "Condition" = "8:"
!             "Object" = "8:_EB664674074C41C5A454E093E56DB20F"
              "FileType" = "3:1"
!             "InstallAction" = "3:1"
              "Arguments" = "8:"
              "EntryPoint" = "8:"
!             "Sequence" = "3:1"
!             "Identifier" = "8:_2E0D89F9_62AD_4B01_A532_24F910A116AA"
              "InstallerClass" = "11:TRUE"
              "CustomActionData" = "8:/name=\"[TARGETDIR]bin\\MMCLib.dll\""
--- 216,276 ----
              "EntryPoint" = "8:"
              "Sequence" = "3:2"
!             "Identifier" = "8:_B728208A_2BDB_4094_AB8F_40CF4B7ECBB9"
              "InstallerClass" = "11:TRUE"
              "CustomActionData" = "8:/name=\"[TARGETDIR]bin\\MMCTest.dll\""
              }
!             "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_7A757FD4E29441B2922A3BF1278F338C"
              {
              "Name" = "8:Primary output from InstallClassRegAsm (Active)"
              "Condition" = "8:"
!             "Object" = "8:_E0E32D3EFB834F41A2FCBADDC3040524"
              "FileType" = "3:1"
              "InstallAction" = "3:1"
              "Arguments" = "8:"
              "EntryPoint" = "8:"
!             "Sequence" = "3:1"
!             "Identifier" = "8:_143E3D35_2993_45BC_8B22_3AA6EEC2DA1F"
              "InstallerClass" = "11:TRUE"
              "CustomActionData" = "8:/name=\"[TARGETDIR]bin\\MMCVBNET.dll\""
              }
!             "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_8D20C8273EB34250BDDCCAF1B2776F0A"
              {
              "Name" = "8:Primary output from InstallClassRegAsm (Active)"
              "Condition" = "8:"
!             "Object" = "8:_E0E32D3EFB834F41A2FCBADDC3040524"
              "FileType" = "3:1"
              "InstallAction" = "3:4"
              "Arguments" = "8:"
              "EntryPoint" = "8:"
!             "Sequence" = "3:1"
!             "Identifier" = "8:_F57296EE_79F9_458B_9E95_5F83940C0BF1"
              "InstallerClass" = "11:TRUE"
              "CustomActionData" = "8:/name=\"[TARGETDIR]bin\\MMCVBNET.dll\""
              }
!             "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_D68CEAB333FA41C3854A3CD837E02B48"
              {
              "Name" = "8:Primary output from InstallClassRegAsm (Active)"
              "Condition" = "8:"
!             "Object" = "8:_E0E32D3EFB834F41A2FCBADDC3040524"
              "FileType" = "3:1"
!             "InstallAction" = "3:1"
              "Arguments" = "8:"
              "EntryPoint" = "8:"
!             "Sequence" = "3:2"
!             "Identifier" = "8:_B58BB601_52DA_4845_850D_48AF30D079BF"
              "InstallerClass" = "11:TRUE"
!             "CustomActionData" = "8:/name=\"[TARGETDIR]bin\\MMCTest.dll\""
              }
!             "{0C9D821E-95BB-411F-BE03-2864360EBF94}:_F4D3A8CDC37A44F190D30A8B4838F372"
              {
              "Name" = "8:Primary output from InstallClassRegAsm (Active)"
              "Condition" = "8:"
!             "Object" = "8:_E0E32D3EFB834F41A2FCBADDC3040524"
              "FileType" = "3:1"
!             "InstallAction" = "3:4"
              "Arguments" = "8:"
              "EntryPoint" = "8:"
!             "Sequence" = "3:3"
!             "Identifier" = "8:_070B3C2A_6D8D_4A85_A9CD_E93A741160B6"
              "InstallerClass" = "11:TRUE"
              "CustomActionData" = "8:/name=\"[TARGETDIR]bin\\MMCLib.dll\""
***************
*** 253,257 ****
          "File"
          {
!             "{A582A373-4685-4296-BEFE-614B80A702C3}:_899AD24EDE397059FC8EBBAE8A111BFB"
              {
              "SourcePath" = "8:MMCLib.tlb"
--- 301,325 ----
          "File"
          {
!             "{A582A373-4685-4296-BEFE-614B80A702C3}:_11F5841925659E8E000E429D0E79865F"
!             {
!             "SourcePath" = "8:mscorlib.tlb"
!             "TargetName" = "8:mscorlib.tlb"
!             "Tag" = "8:"
!             "Folder" = "8:_E45E8D5BFBA5469AB0DDD192E935B661"
!             "Condition" = "8:"
!             "Transitive" = "11:FALSE"
!             "Vital" = "11:TRUE"
!             "ReadOnly" = "11:FALSE"
!             "Hidden" = "11:FALSE"
!             "System" = "11:FALSE"
!             "Permanent" = "11:FALSE"
!             "SharedLegacy" = "11:FALSE"
!             "PackageAs" = "3:1"
!             "Register" = "3:2"
!             "Exclude" = "11:TRUE"
!             "IsDependency" = "11:TRUE"
!             "IsolateTo" = "8:"
!             }
!             "{A582A373-4685-4296-BEFE-614B80A702C3}:_457CA7C12781FD6582CECEA16E4FAEAA"
              {
              "SourcePath" = "8:MMCLib.tlb"
***************
*** 273,282 ****
              "IsolateTo" = "8:"
              }
!             "{A582A373-4685-4296-BEFE-614B80A702C3}:_8F37ACF7835AE93987A7C61848AC9D2A"
              {
!             "SourcePath" = "8:MSVCR71D.dll"
!             "TargetName" = "8:MSVCR71D.dll"
              "Tag" = "8:"
!             "Folder" = "8:_D1B76DB75C104676B1EBC1F8F9FCC9BB"
              "Condition" = "8:"
              "Transitive" = "11:FALSE"
--- 341,361 ----
              "IsolateTo" = "8:"
              }
!             "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_808476A0E9179AB32C7EFA2068EC9540"
              {
!             "AssemblyRegister" = "3:1"
!             "AssemblyIsInGAC" = "11:FALSE"
!             "AssemblyAsmDisplayName" = "8:MMCLib, Version=1.6.7.0, Culture=neutral, PublicKeyToken=96dec4f6748b0cad"
!                 "ScatterAssemblies"
!                 {
!                     "_808476A0E9179AB32C7EFA2068EC9540"
!                     {
!                     "Name" = "8:MMCLib.dll"
!                     "Attributes" = "3:512"
!                     }
!                 }
!             "SourcePath" = "8:MMCLib.dll"
!             "TargetName" = "8:"
              "Tag" = "8:"
!             "Folder" = "8:_E45E8D5BFBA5469AB0DDD192E935B661"
              "Condition" = "8:"
              "Transitive" = "11:FALSE"
***************
*** 289,302 ****
              "PackageAs" = "3:1"
              "Register" = "3:1"
!             "Exclude" = "11:FALSE"
              "IsDependency" = "11:TRUE"
              "IsolateTo" = "8:"
              }
!             "{A582A373-4685-4296-BEFE-614B80A702C3}:_A0CE67D1A4E093BA815DFACD5CC2D05A"
              {
!             "SourcePath" = "8:RPCRT4.dll"
!             "TargetName" = "8:RPCRT4.dll"
              "Tag" = "8:"
!             "Folder" = "8:_D1B76DB75C104676B1EBC1F8F9FCC9BB"
              "Condition" = "8:"
              "Transitive" = "11:FALSE"
--- 368,392 ----
              "PackageAs" = "3:1"
              "Register" = "3:1"
!             "Exclude" = "11:TRUE"
              "IsDependency" = "11:TRUE"
              "IsolateTo" = "8:"
              }
!             "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_BDF78D5D7C69788B7DE034BBB8A6C1DB"
              {
!             "AssemblyRegister" = "3:1"
!             "AssemblyIsInGAC" = "11:TRUE"
!             "AssemblyAsmDisplayName" = "8:Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
!                 "ScatterAssemblies"
!                 {
!                     "_BDF78D5D7C69788B7DE034BBB8A6C1DB"
!                     {
!                     "Name" = "8:Microsoft.mshtml.dll"
!                     "Attributes" = "3:512"
!                     }
!                 }
!             "SourcePath" = "8:Microsoft.mshtml.dll"
!             "TargetName" = "8:"
              "Tag" = "8:"
!             "Folder" = "8:_E45E8D5BFBA5469AB0DDD192E935B661"
              "Condition" = "8:"
              "Transitive" = "11:FALSE"
***************
*** 309,317 ****
              "PackageAs" = "3:1"
              "Register" = "3:1"
!             "Exclude" = "11:TRUE"
              "IsDependency" = "11:TRUE"
              "IsolateTo" = "8:"
              }
!             "{A582A373-4685-4296-BEFE-614B80A702C3}:_B274E6F63B0576A0DDBD2ADF38870812"
              {
              "SourcePath" = "8:MMCTest.tlb"
--- 399,407 ----
              "PackageAs" = "3:1"
              "Register" = "3:1"
!             "Exclude" = "11:FALSE"
              "IsDependency" = "11:TRUE"
              "IsolateTo" = "8:"
              }
!             "{A582A373-4685-4296-BEFE-614B80A702C3}:_C9D2B5BFB1CFCBA437794954A95C86FE"
              {
              "SourcePath" = "8:MMCTest.tlb"
***************
*** 333,350 ****
              "IsolateTo" = "8:"
              }
!             "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_C40698BF74873FFC61E0D2EF3C146C61"
              {
              "AssemblyRegister" = "3:1"
              "AssemblyIsInGAC" = "11:FALSE"
!             "AssemblyAsmDisplayName" = "8:MMCLib, Version=1.6.0.0, Culture=neutral"
                  "ScatterAssemblies"
                  {
!                     "_C40698BF74873FFC61E0D2EF3C146C61"
                      {
!                     "Name" = "8:MMCLib.dll"
                      "Attributes" = "3:512"
                      }
                  }
!             "SourcePath" = "8:MMCLib.dll"
              "TargetName" = "8:"
              "Tag" = "8:"
--- 423,460 ----
              "IsolateTo" = "8:"
              }
!             "{A582A373-4685-4296-BEFE-614B80A702C3}:_CB2754E5B1F232B15E23EF5598B347A4"
!             {
!             "SourcePath" = "8:shdocvw.dll"
!             "TargetName" = "8:shdocvw.dll"
!             "Tag" = "8:"
!             "Folder" = "8:_E45E8D5BFBA5469AB0DDD192E935B661"
!             "Condition" = "8:"
!             "Transitive" = "11:FALSE"
!             "Vital" = "11:TRUE"
!             "ReadOnly" = "11:FALSE"
!             "Hidden" = "11:FALSE"
!             "System" = "11:FALSE"
!             "Permanent" = "11:FALSE"
!             "SharedLegacy" = "11:FALSE"
!             "PackageAs" = "3:1"
!             "Register" = "3:4"
!             "Exclude" = "11:TRUE"
!             "IsDependency" = "11:TRUE"
!             "IsolateTo" = "8:"
!             }
!             "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_D6946C5DE97B6D11BA33803891FC8B7A"
              {
              "AssemblyRegister" = "3:1"
              "AssemblyIsInGAC" = "11:FALSE"
!             "AssemblyAsmDisplayName" = "8:Interop.SHDocVw, Version=1.1.0.0, Culture=neutral, PublicKeyToken=a564fc960fecc6cb"
                  "ScatterAssemblies"
                  {
!                     "_D6946C5DE97B6D11BA33803891FC8B7A"
                      {
!                     "Name" = "8:Interop.SHDocVw.dll"
                      "Attributes" = "3:512"
                      }
                  }
!             "SourcePath" = "8:Interop.SHDocVw.dll"
              "TargetName" = "8:"
              "Tag" = "8:"
***************
*** 360,363 ****
--- 470,513 ----
              "PackageAs" = "3:1"
              "Register" = "3:1"
+             "Exclude" = "11:FALSE"
+             "IsDependency" = "11:TRUE"
+             "IsolateTo" = "8:"
+             }
+             "{A582A373-4685-4296-BEFE-614B80A702C3}:_DB7DBE3420047BCC61BE98116D66F05A"
+             {
+             "SourcePath" = "8:MSVCR71.dll"
+             "TargetName" = "8:MSVCR71.dll"
+             "Tag" = "8:"
+             "Folder" = "8:_E45E8D5BFBA5469AB0DDD192E935B661"
+             "Condition" = "8:"
+             "Transitive" = "11:FALSE"
+             "Vital" = "11:TRUE"
+             "ReadOnly" = "11:FALSE"
+             "Hidden" = "11:FALSE"
+             "System" = "11:FALSE"
+             "Permanent" = "11:FALSE"
+             "SharedLegacy" = "11:FALSE"
+             "PackageAs" = "3:1"
+             "Register" = "3:1"
+             "Exclude" = "11:FALSE"
+             "IsDependency" = "11:TRUE"
+             "IsolateTo" = "8:"
+             }
+             "{A582A373-4685-4296-BEFE-614B80A702C3}:_FF374E806197BEDD27C0151CBFDCB14F"
+             {
+             "SourcePath" = "8:RPCRT4.dll"
+             "TargetName" = "8:RPCRT4.dll"
+             "Tag" = "8:"
+             "Folder" = "8:_E45E8D5BFBA5469AB0DDD192E935B661"
+             "Condition" = "8:"
+             "Transitive" = "11:FALSE"
+             "Vital" = "11:TRUE"
+             "ReadOnly" = "11:FALSE"
+             "Hidden" = "11:FALSE"
+             "System" = "11:FALSE"
+             "Permanent" = "11:FALSE"
+             "SharedLegacy" = "11:FALSE"
+             "PackageAs" = "3:1"
+             "Register" = "3:1"
              "Exclude" = "11:TRUE"
              "IsDependency" = "11:TRUE"
***************
*** 442,446 ****
          "ProductName" = "8:MMCSetup"
          "ProductCode" = "8:{06E3F2F2-051D-4735-A04D-973EE3B83DB0}"
!         "PackageCode" = "8:{46416395-224A-48AF-9AA8-D27EC12297BA}"
          "UpgradeCode" = "8:{66C12FDF-26F9-429D-B2BB-C035EBF101F0}"
          "RestartWWWService" = "11:FALSE"
--- 592,596 ----
          "ProductName" = "8:MMCSetup"
          "ProductCode" = "8:{06E3F2F2-051D-4735-A04D-973EE3B83DB0}"
!         "PackageCode" = "8:{70D87653-34EC-4E31-9361-487592520154}"
          "UpgradeCode" = "8:{66C12FDF-26F9-429D-B2BB-C035EBF101F0}"
          "RestartWWWService" = "11:FALSE"
***************
*** 586,600 ****
                              "UsePlugInResources" = "11:TRUE"
                              }
!                             "UpdateText"
                              {
!                             "Name" = "8:UpdateText"
!                             "DisplayName" = "8:#1058"
!                             "Description" = "8:#1158"
!                             "Type" = "3:15"
                              "ContextData" = "8:"
                              "Attributes" = "3:0"
                              "Setting" = "3:1"
!                             "Value" = "8:#1258"
!                             "DefaultValue" = "8:#1258"
                              "UsePlugInResources" = "11:TRUE"
                              }
--- 736,750 ----
                              "UsePlugInResources" = "11:TRUE"
                              }
!                             "BodyText"
                              {
!                             "Name" = "8:BodyText"
!                             "DisplayName" = "8:#1015"
!                             "Description" = "8:#1115"
!                             "Type" = "3:3"
                              "ContextData" = "8:"
                              "Attributes" = "3:0"
                              "Setting" = "3:1"
!                             "Value" = "8:#1215"
!                             "DefaultValue" = "8:#1215"
                              "UsePlugInResources" = "11:TRUE"
                              }
***************
*** 775,778 ****
--- 925,941 ----
                              "UsePlugInResources" = "11:TRUE"
                              }
+                             "BodyText"
+                             {
+                             "Name" = "8:BodyText"
+                             "DisplayName" = "8:#1015"
+                             "Description" = "8:#1115"
+                             "Type" = "3:3"
+                             "ContextData" = "8:"
+                             "Attributes" = "3:0"
+                             "Setting" = "3:1"
+                             "Value" = "8:#1215"
+                             "DefaultValue" = "8:#1215"
+                             "UsePlugInResources" = "11:TRUE"
+                             }
                          }
                      }
***************
*** 912,916 ****
                          }
                      }
!                     "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_6093A326B6E74A6B8340FBD18B2E9757"
                      {
                      "Sequence" = "3:200"
--- 1075,1079 ----
                          }
                      }
!                     "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_5BAFF2C3CDFD46AB9E3B100BF898101D"
                      {
                      "Sequence" = "3:200"
***************
*** 939,943 ****
          "MergeModule"
          {
!             "{35A69C6E-5BA4-440D-803D-762B59A45393}:_73B9F248034844408D96E9260E735576"
              {
              "UseDynamicProperties" = "11:TRUE"
--- 1102,1106 ----
          "MergeModule"
          {
!             "{35A69C6E-5BA4-440D-803D-762B59A45393}:_8C576DA1DBE74B6F813CDF64598FB1F9"
              {
              "UseDynamicProperties" = "11:TRUE"
***************
*** 958,962 ****
              "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_367ED5CAA8A94A76A9DE182C2FE977A1"
              {
!             "SourcePath" = "8:..\\MMCFormsShim\\Debug\\MMCFormsShim.dll"
              "TargetName" = "8:"
              "Tag" = "8:"
--- 1121,1125 ----
              "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_367ED5CAA8A94A76A9DE182C2FE977A1"
              {
!             "SourcePath" = "8:..\\MMCFormsShim\\Release\\MMCFormsShim.dll"
              "TargetName" = "8:"
              "Tag" = "8:"
***************
*** 984,1015 ****
                  }
              }
-             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_39B1D2EF5AAB437BAC3149B849982364"
-             {
-             "SourcePath" = "8:..\\VBNETSnapin\\obj\\Debug\\MMCVBNET.dll"
-             "TargetName" = "8:"
-             "Tag" = "8:"
-             "Folder" = "8:_E45E8D5BFBA5469AB0DDD192E935B661"
-             "Condition" = "8:"
-             "Transitive" = "11:FALSE"
-             "Vital" = "11:TRUE"
-             "ReadOnly" = "11:FALSE"
-             "Hidden" = "11:FALSE"
-             "System" = "11:FALSE"
-             "Permanent" = "11:FALSE"
-             "SharedLegacy" = "11:FALSE"
-             "PackageAs" = "3:1"
-             "Register" = "3:1"
-             "Exclude" = "11:FALSE"
-             "IsDependency" = "11:FALSE"
-             "IsolateTo" = "8:"
-             "ProjectOutputGroupRegister" = "3:2"
-             "OutputConfiguration" = "8:"
-             "OutputGroupCanonicalName" = "8:Built"
-             "OutputProjectGuid" = "8:{3EC895E3-8119-4101-AFC0-DB3860563615}"
-             "ShowKeyOutput" = "11:TRUE"
-                 "ExcludeFilters"
-                 {
-                 }
-             }
              "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_6422F0CD578048EA834E8FCFF6DC65BD"
              {
--- 1147,1150 ----
***************
*** 1040,1071 ****
                  }
              }
-             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_83C0A76C45784EDD8357ACF6494A8CBD"
-             {
-             "SourcePath" = "8:"
-             "TargetName" = "8:"
-             "Tag" = "8:"
-             "Folder" = "8:_9B2CB27423F74214A66D4C646A0FD2DE"
-             "Condition" = "8:"
-             "Transitive" = "11:FALSE"
-             "Vital" = "11:TRUE"
-             "ReadOnly" = "11:FALSE"
-             "Hidden" = "11:FALSE"
-             "System" = "11:FALSE"
-             "Permanent" = "11:FALSE"
-             "SharedLegacy" = "11:FALSE"
-             "PackageAs" = "3:1"
-             "Register" = "3:1"
-             "Exclude" = "11:FALSE"
-             "IsDependency" = "11:FALSE"
-             "IsolateTo" = "8:"
-             "ProjectOutputGroupRegister" = "3:1"
-             "OutputConfiguration" = "8:"
-             "OutputGroupCanonicalName" = "8:ContentFiles"
-             "OutputProjectGuid" = "8:{3EC895E3-8119-4101-AFC0-DB3860563615}"
-             "ShowKeyOutput" = "11:TRUE"
-                 "ExcludeFilters"
-                 {
-                 }
-             }
              "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_B686A20FE12F4744882819E3106D70DB"
              {
--- 1175,1178 ----
***************
*** 1096,1100 ****
                  }
              }
!             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EB664674074C41C5A454E093E56DB20F"
              {
              "SourcePath" = "8:..\\InstallClassRegAsm\\obj\\Debug\\InstallClassRegAsm.dll"
--- 1203,1207 ----
                  }
              }
!             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_E0E32D3EFB834F41A2FCBADDC3040524"
              {
              "SourcePath" = "8:..\\InstallClassRegAsm\\obj\\Debug\\InstallClassRegAsm.dll"

[Mmclibrary-cvs] mmclibrary/VBNETSnapin/resources/images Closed.ico,1.1,NONE Happy.ico,1.1,NONE LargeImage.bmp,1.1,NONE Main.ico,1.1,NONE Open.ico,1.1,NONE SmallImage.bmp,1.1,NONE SmallOpenImage.bmp,1.1,NONE SuperToolBar.bmp,1.1,NONE snapin.Ico,1.1,NONE

[Alexander K. <kac...@us...>]

Update of /cvsroot/mmclibrary/mmclibrary/VBNETSnapin/resources/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31617/VBNETSnapin/resources/images

Removed Files:
	Closed.ico Happy.ico LargeImage.bmp Main.ico Open.ico 
	SmallImage.bmp SmallOpenImage.bmp SuperToolBar.bmp snapin.Ico 
Log Message:


--- Open.ico DELETED ---

--- LargeImage.bmp DELETED ---

--- Closed.ico DELETED ---

--- SuperToolBar.bmp DELETED ---

--- snapin.Ico DELETED ---

--- Happy.ico DELETED ---

--- SmallImage.bmp DELETED ---

--- Main.ico DELETED ---

--- SmallOpenImage.bmp DELETED ---

[Mmclibrary-cvs] mmclibrary/VBNETSnapin VBNETSnapin.msc,1.1,1.2 VBNETSnapin.vbproj,1.1,1.2

[Alexander K. <kac...@us...>]

Update of /cvsroot/mmclibrary/mmclibrary/VBNETSnapin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31199/VBNETSnapin

Modified Files:
	VBNETSnapin.msc VBNETSnapin.vbproj 
Log Message:


Index: VBNETSnapin.vbproj
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/VBNETSnapin/VBNETSnapin.vbproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VBNETSnapin.vbproj	21 Nov 2003 12:30:48 -0000	1.1
--- VBNETSnapin.vbproj	5 Dec 2004 15:19:52 -0000	1.2
***************
*** 34,38 ****
                      IncrementalBuild = "true"
                      Optimize = "false"
!                     OutputPath = "bin\"
                      RegisterForComInterop = "true"
                      RemoveIntegerChecks = "false"
--- 34,38 ----
                      IncrementalBuild = "true"
                      Optimize = "false"
!                     OutputPath = "bin\Debug\"
                      RegisterForComInterop = "true"
                      RemoveIntegerChecks = "false"
***************
*** 71,83 ****
                  />
                  <Reference
-                     Name = "MMCLib"
-                     Project = "{A6576BD5-7537-4858-BEE9-7EA4FAC6C686}"
-                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                 />
-                 <Reference
                      Name = "System.Windows.Forms"
                      AssemblyName = "System.Windows.Forms"
                      HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll"
                  />
              </References>
              <Imports>
--- 71,83 ----
                  />
                  <Reference
                      Name = "System.Windows.Forms"
                      AssemblyName = "System.Windows.Forms"
                      HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll"
                  />
+                 <Reference
+                     Name = "MMCLib"
+                     Project = "{A6576BD5-7537-4858-BEE9-7EA4FAC6C686}"
+                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                 />
              </References>
              <Imports>
***************
*** 97,106 ****
                  />
                  <File
-                     RelPath = "Snapin.msc"
-                     BuildAction = "None"
-                 />
-                 <File
                      RelPath = "Snapin.vb"
!                     SubType = "Code"
                      BuildAction = "Compile"
                  />
--- 97,102 ----
                  />
                  <File
                      RelPath = "Snapin.vb"
!                     SubType = "Component"
                      BuildAction = "Compile"
                  />
***************
*** 116,156 ****
                  />
                  <File
!                     RelPath = "nodes\MyBaseNode.vb"
!                     SubType = "Code"
!                     BuildAction = "Compile"
                  />
                  <File
!                     RelPath = "nodes\MyReportNode.vb"
!                     SubType = "Code"
!                     BuildAction = "Compile"
                  />
                  <File
!                     RelPath = "nodes\RootNode.vb"
!                     SubType = "Code"
!                     BuildAction = "Compile"
                  />
                  <File
!                     RelPath = "resources\images\Closed.ico"
                      BuildAction = "EmbeddedResource"
                  />
                  <File
!                     RelPath = "resources\images\Happy.ico"
                      BuildAction = "EmbeddedResource"
                  />
                  <File
!                     RelPath = "resources\images\Main.ico"
                      BuildAction = "EmbeddedResource"
                  />
                  <File
!                     RelPath = "resources\images\Open.ico"
                      BuildAction = "EmbeddedResource"
                  />
                  <File
!                     RelPath = "resources\images\snapin.Ico"
!                     BuildAction = "EmbeddedResource"
                  />
                  <File
!                     RelPath = "resources\images\SuperToolBar.bmp"
!                     BuildAction = "EmbeddedResource"
                  />
              </Include>
--- 112,156 ----
                  />
                  <File
!                     RelPath = "VBNETSnapin.msc"
!                     BuildAction = "Content"
                  />
                  <File
!                     RelPath = "images\Closed.ico"
!                     BuildAction = "EmbeddedResource"
                  />
                  <File
!                     RelPath = "images\Happy.ico"
!                     BuildAction = "EmbeddedResource"
                  />
                  <File
!                     RelPath = "images\Main.ico"
                      BuildAction = "EmbeddedResource"
                  />
                  <File
!                     RelPath = "images\Open.ico"
                      BuildAction = "EmbeddedResource"
                  />
                  <File
!                     RelPath = "images\snapin.Ico"
                      BuildAction = "EmbeddedResource"
                  />
                  <File
!                     RelPath = "images\SuperToolBar.bmp"
                      BuildAction = "EmbeddedResource"
                  />
                  <File
!                     RelPath = "nodes\MyBaseNode.vb"
!                     SubType = "Code"
!                     BuildAction = "Compile"
                  />
                  <File
!                     RelPath = "nodes\MyReportNode.vb"
!                     SubType = "Code"
!                     BuildAction = "Compile"
!                 />
!                 <File
!                     RelPath = "nodes\RootNode.vb"
!                     SubType = "Code"
!                     BuildAction = "Compile"
                  />
              </Include>

Index: VBNETSnapin.msc
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/VBNETSnapin/VBNETSnapin.msc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VBNETSnapin.msc	27 Nov 2003 06:16:14 -0000	1.1
--- VBNETSnapin.msc	5 Dec 2004 15:19:52 -0000	1.2
***************
*** 1,5 ****
  <?xml version="1.0"?>
  <MMC_ConsoleFile ConsoleVersion="2.0" ProgramMode="Author">
!   <ConsoleFileID>{990506D2-51EC-4468-9330-F53DE0D1FBA2}</ConsoleFileID>
    <FrameState ShowStatusBar="true">
      <WindowPlacement ShowCommand="SW_SHOWNORMAL">
--- 1,5 ----
  <?xml version="1.0"?>
  <MMC_ConsoleFile ConsoleVersion="2.0" ProgramMode="Author">
!   <ConsoleFileID>{C6CA2B6B-A2D5-42AC-950E-72391AC6AF50}</ConsoleFileID>
    <FrameState ShowStatusBar="true">
      <WindowPlacement ShowCommand="SW_SHOWNORMAL">
***************
*** 15,19 ****
        <WindowPlacement WPF_RESTORETOMAXIMIZED="true" ShowCommand="SW_SHOWMAXIMIZED">
          <Point Name="MinPosition" X="-1" Y="-1"/>
!         <Point Name="MaxPosition" X="-4" Y="-23"/>
          <Rectangle Name="NormalPosition" Top="0" Bottom="284" Left="0" Right="624"/>
        </WindowPlacement>
--- 15,19 ----
        <WindowPlacement WPF_RESTORETOMAXIMIZED="true" ShowCommand="SW_SHOWMAXIMIZED">
          <Point Name="MinPosition" X="-1" Y="-1"/>
!         <Point Name="MaxPosition" X="-4" Y="-30"/>
          <Rectangle Name="NormalPosition" Top="0" Bottom="284" Left="0" Right="624"/>
        </WindowPlacement>
***************
*** 38,44 ****
        <Node ID="1" ImageIdx="0" CLSID="{C96401CC-0E17-11D3-885B-00C04F72C717}" Preload="true">
          <Nodes>
!           <Node ID="2" ImageIdx="0" CLSID="{7CF9023C-38E4-44B8-9F1E-BBA2E8A4F411}" Preload="false">
              <Nodes/>
!             <String Name="Name" ID="2"/>
              <Bitmaps>
                <BinaryData Name="Small" BinaryRefIndex="0"/>
--- 38,44 ----
        <Node ID="1" ImageIdx="0" CLSID="{C96401CC-0E17-11D3-885B-00C04F72C717}" Preload="true">
          <Nodes>
!           <Node ID="3" ImageIdx="0" CLSID="{7CF9023C-38E4-44B8-9F1E-BBA2E8A4F411}" Preload="false">
              <Nodes/>
!             <String Name="Name" ID="4"/>
              <Bitmaps>
                <BinaryData Name="Small" BinaryRefIndex="0"/>
***************
*** 78,88 ****
    <ColumnSettingsCache/>
    <StringTables>
!     <IdentifierPool AbsoluteMin="1" AbsoluteMax="65535" NextAvailable="4"/>
      <StringTable>
        <GUID>{71E5B33E-1064-11D2-808F-0000F875A9CE}</GUID>
        <Strings>
          <String ID="1" Refs="1">Favorites</String>
-         <String ID="2" Refs="1">Sample Root Node</String>
          <String ID="3" Refs="2">Console Root</String>
        </Strings>
      </StringTable>
--- 78,88 ----
    <ColumnSettingsCache/>
    <StringTables>
!     <IdentifierPool AbsoluteMin="1" AbsoluteMax="65535" NextAvailable="5"/>
      <StringTable>
        <GUID>{71E5B33E-1064-11D2-808F-0000F875A9CE}</GUID>
        <Strings>
          <String ID="1" Refs="1">Favorites</String>
          <String ID="3" Refs="2">Console Root</String>
+         <String ID="4" Refs="1">Sample Root Node</String>
        </Strings>
      </StringTable>
***************
*** 90,95 ****
    <BinaryStorage>
      <Binary>
! SUwBAQQACAAEABAAEAD/////CQD//////////0JNNgQAAAAAAAA2BAAAKAAAAEAAAAAgAAAAAQAI
! AAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAADAwMAA
  wNzAAPDKpgAzAAAAAAAzADMAMwAzMwAAFhYWABwcHAAiIiIAKSkpAFVVVQBNTU0AQkJCADk5OQCA
  fP8AUFD/AJMA1gD/7MwAxtbvANbn5wCQqa0AAP8zAAAAZgAAAJkAAADMAAAzAAAAMzMAADNmAAAz
--- 90,95 ----
    <BinaryStorage>
      <Binary>
! SUwBAQIAAwAEABAAEAD/////CQD//////////0JNNgQAAAAAAAA2BAAAKAAAAEAAAAAQAAAAAQAI
! AAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAADAwMAA
  wNzAAPDKpgAzAAAAAAAzADMAMwAzMwAAFhYWABwcHAAiIiIAKSkpAFVVVQBNTU0AQkJCADk5OQCA
  fP8AUFD/AJMA1gD/7MwAxtbvANbn5wCQqa0AAP8zAAAAZgAAAJkAAADMAAAzAAAAMzMAADNmAAAz
***************
*** 110,154 ****
  hoaGAJaWlgDLy8sAsrKyANfX1wDd3d0A4+PjAOrq6gDx8fEA+Pj4APD7/wCkoKAAgICAAAAA/wAA
  /wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAA7Afs/wf//wD//wf/////AAAAAAD/////////B+wAAADsB+z/
! B///AP//B/////8AAAAAAP////////8H7AAAAOwH7P8H/////+wAAP//7Ozs7OzsAP///wAA/wfs
! AAAA7Afs/wf/////7AAA///s7Ozs7OwA////AAD/B+wAAADsB+z/BwcHAP/sB+wAAAcHBwcHB+wA
! AAAHAP8H7AAAAOwH7P8HBwcA/+wH7AAABwcHBwcH7AAAAAcA/wfsAAAA7Afs/wf//wD/7P8H7Oz/
! BwcHBwcH7AcHAP//B+wAAADsB+z/B///AP/s/wfs7P8HBwcHBwfsBwcA//8H7AAAAOwH7P8H////
! /+z//+zs//8HBwcHBwcHAP///wfsAAAA7Afs/wf/////7P//7Oz//wcHBwcHBwcA////B+wAAADs
! B+z/AP/////s7Oz//+z////////s7P////8H7AAAAOwH7P8A/////+zs7P//7P///////+zs////
! /wfsAAAA7Afs/wD//////wf/////7Ozs7Ozs////////B+wAAADsB+z/AP//////B//////s7Ozs
! 7Oz///////8H7AAAAOwH7P////////8H/////////////////////wfsAAAA7Afs/////////wf/
! ////////////////////B+wAAADsB+zs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OwH7AAAAOwH7Ozs
! 7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7AfsAAAA7AcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHB+wA
! AADsBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcH7AAAAOwEBAQEBAQEBAQEBAQEBAQEBAQEBAQE
! BAQAAADsAAAA7AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAAAAOwAAADsBAQEBAQEBAQEBAQEBAQE
! BAQEBAQEBAQHAAcA7AAAAOwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAcABwDsAAAA7AQEBAQEBAQE
! BAQEBAQEBAQEBAQEBAQEBAQEBOwAAADsBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQE7AAAAOzs
! 7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OzsAAAA7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs
! 7OwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAEJNPgAAAAAAAAA+AAAAKAAAAEAAAAAgAAAAAQABAAAAAAAAAQAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAwAAAAMAAAADAAAA
! AwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAMAAAAD
! AAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAMAAAAD/////////////////////w==
      </Binary>
      <Binary>
--- 110,134 ----
  hoaGAJaWlgDLy8sAsrKyANfX1wDd3d0A4+PjAOrq6gDx8fEA+Pj4APD7/wCkoKAAgICAAAAA/wAA
  /wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v7+/sAAAAAAAAAAAAAAPv7+/v7
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD7+/v7+/v7+/sAAAAAAAAA
+ +/v7+/v7+/v7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD7+/v7+/v7+/v7
+ +wAAAAAA+/v7+wAAAPv7+/sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v7
+ +/v7+/v7+/sAAAAAAPv7+wD5+fkA+/v7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAA+/v7+wAAAAAA+/v7+wAAAPv7+wD5AAAA+QD7+/sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAPv7+/v7+/v7+/v7+/sAAAD7+/sAAPv7+wAA+/v7AAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAD7+/v7+/v7+/v7+/v7AAAA+/sA+/v7+/v7+wD7+wAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v7+/v7+/v7+/v7+wAAAPv7+/v7+/v7+/v7+/sAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPv7+wAA+/v7AAD7+/sAAAD7+/v7AAD7AAD7
+ +/v7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/sAAPv7+wAA+/sAAAAAAPv7
+ +wAA+wAA+/v7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPv7+/v7+/v7+/v7
+ AAAAAAD7+/v7+/v7+/v7+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v7
+ +/v7+/v7AAAAAAAAAPv7+/v7+/v7+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAA+/v7+/sAAAAAAAAAAAAAAPv7+/v7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAQk0+AAAAAAAAAD4AAAAoAAAAQAAAABAAAAABAAEAAAAAAIAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wD8H/wfAAAAAPAH8AcAAAAA4APgAwAAAADAAcABAAAA
! AMABwAEAAAAAgACAAAAAAACAAIAAAAAAAIAAgAAAAAAAgACAAAAAAACAAIAAAAAAAMABwAEAAAAA
! wAHAAQAAAADgA+ADAAAAAPAH8AcAAAAA/B/8HwAAAAD/////AAAAAA==
      </Binary>
      <Binary>
***************
*** 174,266 ****
  /wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAwDsAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+wPsAOzs7Ozs7Ozs7OzsAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/7AMA/wUF//n5/wYG/+wAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/sD7AD/
! BQX/+fn/Bgb/7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs7Ozs7Ozs
! 7Ozs7Ozs7OwD/+wDAP8FBf/5+f8GBv/sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAOwHBwcHBwcHBwcHBwcHBwP7A+wA/wUF//n5/wYG/+wAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAA7Afs/////////wf/////A//sAwD/BQX/////Bgb/7AAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADsB+z/////////B/////8D+wPsAP//
! //////8GBv/sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwH7P//////
! //8H/////wP/7AMA/////////////+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAA7Afs/////////wf/////A/vs7ADs7Ozs7Ozs7Ozs7AAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAADsB+z//wcHBwD/B/////8DB/sDAAQEBAQEAAcABwDsAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwH7P//B///AP8H//////8D7AAEBAQE
! BAQEBAQEBOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA7Afs//8H////
! /wf//////+wHAOzs7Ozs7Ozs7Ozs7OwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAADsB+z/BwcHAP//B///////AOwA//////////8H7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAOwH7P8H//8A//8H/////wAAAAAA/////////wfsAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA7Afs/wf/////7AAA///s7Ozs7OwA////
! AAD/B+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADsB+z/BwcHAP/s
! B+wAAAcHBwcHB+wAAAAHAP8H7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAOwH7P8H//8A/+z/B+zs/wcHBwcHB+wHBwD//wfsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAA7Afs/wf/////7P//7Oz//wcHBwcHBwcA////B+wAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADsB+z/AP/////s7Oz//+z////////s7P//
! //8H7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwH7P8A//////8H
! /////+zs7Ozs7P///////wfsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAA7Afs/////////wf/////////////////////B+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAADsB+zs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OwH7AAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcH
! BwfsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA7AQEBAQEBAQEBAQE
! BAQEBAQEBAQEBAQEBAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AADsBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQHAAcA7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAOwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBATsAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs
! 7OwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAQk0+AAAAAAAAAD4AAAAoAAAAgAAAACAAAAABAAEAAAAAAAACAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAP///wD/////AAAAAAAAAAAAAAAA/////wAAAAAAAAAAAAAAAP/+gAAA
! AAAAAAAAAAAAAAD//gAAAAAAAAAAAAAAAAAA//4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAwAAAAAA
! AAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAA
! AAMAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAMAAAAAAAAA
! AAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAD
! AAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAD/////AAAAAAAAAAAA
! AAAA/////wAAAAAAAAAAAAAAAA==
      </Binary>
      <Binary>
! AAEAAAD/////AQAAAAAAAAAEAQAAABxTeXN0ZW0uQ29sbGVjdGlvbnMuSGFzaHRhYmxlBwAAAApM
! b2FkRmFjdG9yB1ZlcnNpb24IQ29tcGFyZXIQSGFzaENvZGVQcm92aWRlcghIYXNoU2l6ZQRLZXlz
! BlZhbHVlcwAAAwMABQULCBxTeXN0ZW0uQ29sbGVjdGlvbnMuSUNvbXBhcmVyJFN5c3RlbS5Db2xs
! ZWN0aW9ucy5JSGFzaENvZGVQcm92aWRlcgjsUTg/AwAAAAoKCwAAAAkCAAAACQMAAAAQAgAAAAMA
! AAAGBAAAAAhUYWJJbmRleAYFAAAABE5hbWUGBgAAAAhMb2NhdGlvbhADAAAAAwAAAAYHAAAAATAG
! CAAAAAAGCQAAAAQwLCAwCw==
      </Binary>
      <Binary>
--- 154,241 ----
  /wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPv7+/v7+/v7
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAA+/v7+/v7+/v7+/v7+/sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAPv7+/v7+/v7+/v7+/v7+/sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPv7+/v7+/v7+/v7+/v7+/v7+/v7AAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD7+/v7+/v7+/v7+/v7+/v7
! +/v7+/v7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v7
! +/v7+/v7AAAAAAAAAPv7+/v7+/v7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAD7+/v7+/v7AAD7+/v7+/v7AAD7+/v7+/sAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v7+/v7+wAA+/v7+/v7+/v7AAD7+/v7+/sAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPv7+/v7+/sAAPv7+/v7+/v7+/v7
! AAD7+/v7+/sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v7+/v7
! +wD7+/v7+/v7+/v7+/v7APv7+/v7+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAD7+/v7+/sA+/v7+/v7+/v7+/v7+/v7APv7+/v7AAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v7+/v7+wD7+/v7+/v7+/v7+/v7+/sA+/v7+/v7AAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD7+/v7+/v7APv7+/v7+/v7+/v7+/v7
! +wD7+/v7+/sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPv7+/v7+/v7
! +/v7+/v7+/v7+/v7+/v7+/v7+/v7+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAA+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7AAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAD7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/sAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPv7+/v7+/v7+/sAAPv7+/v7+wAA+/v7
! +/v7+/v7+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v7+/v7+/v7
! AAAAAPv7+/sAAAAA+/v7+/v7+/v7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAD7+/v7+/v7+/sAAAAA+/v7+wAAAAD7+/v7+/v7+/sAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAD7+/v7+/v7+wAAAAD7+/v7AAAAAPv7+/v7+/v7AAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPv7+/v7+/v7AAAAAPv7+/sAAAAA+/v7
! +/v7+/sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v7+/v7+/sA
! AAAA+/v7+wAAAAD7+/v7+/v7+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAA+/v7+/v7+/sAAPv7+/v7+wAA+/v7+/v7+/sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7AAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD7+/v7+/v7+/v7+/v7+/v7+/v7+/v7
! +/sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD7+/v7+/v7
! +/v7+/v7+/v7+/v7+/v7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAD7+/v7+/v7+/v7+/v7+/v7+/v7+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v7+/v7+/v7+/v7+/v7+wAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v7+/v7+/v7+/v7+/sAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD7
+ +/v7+/v7+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAQk0+AAAAAAAAAD4AAAAoAAAAgAAAACAAAAABAAEAAAAAAAACAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAP///wD/wA//AAAAAAAAAAAAAAAA/4AB/wAAAAAAAAAAAAAAAP4AAH8A
! AAAAAAAAAAAAAAD8AAA/AAAAAAAAAAAAAAAA+AAAHwAAAAAAAAAAAAAAAPAAAA8AAAAAAAAAAAAA
! AADgAAAHAAAAAAAAAAAAAAAAwAAAAwAAAAAAAAAAAAAAAMAAAAMAAAAAAAAAAAAAAACAAAABAAAA
! AAAAAAAAAAAAgAAAAQAAAAAAAAAAAAAAAIAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
! AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAA
! AAEAAAAAAAAAAAAAAACAAAABAAAAAAAAAAAAAAAAgAAAAQAAAAAAAAAAAAAAAMAAAAMAAAAAAAAA
! AAAAAADAAAADAAAAAAAAAAAAAAAA4AAABwAAAAAAAAAAAAAAAPAAAA8AAAAAAAAAAAAAAAD4AAAf
! AAAAAAAAAAAAAAAA/AAAHwAAAAAAAAAAAAAAAP4AAH8AAAAAAAAAAAAAAAD/gAD/AAAAAAAAAAAA
! AAAA//AB/wAAAAAAAAAAAAAAAA==
      </Binary>
      <Binary>
! 
      </Binary>
      <Binary>

[Mmclibrary-cvs] mmclibrary/VBNETSnapin/images Closed.ico,NONE,1.1 Happy.ico,NONE,1.1 LargeImage.bmp,NONE,1.1 Main.ico,NONE,1.1 Open.ico,NONE,1.1 SmallImage.bmp,NONE,1.1 SmallOpenImage.bmp,NONE,1.1 SuperToolBar.bmp,NONE,1.1 snapin.Ico,NONE,1.1 sqlgui.rll#70.ico,NONE,1.1 sqlgui.rll#71.ico,NONE,1.1 sqlmmc.rll#1.ico,NONE,1.1 sqlns.rll#301.ico,NONE,1.1

[Alexander K. <kac...@us...>]

Update of /cvsroot/mmclibrary/mmclibrary/VBNETSnapin/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31199/VBNETSnapin/images

Added Files:
	Closed.ico Happy.ico LargeImage.bmp Main.ico Open.ico 
	SmallImage.bmp SmallOpenImage.bmp SuperToolBar.bmp snapin.Ico 
	sqlgui.rll#70.ico sqlgui.rll#71.ico sqlmmc.rll#1.ico 
	sqlns.rll#301.ico 
Log Message:


--- NEW FILE: sqlmmc.rll#1.ico ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: snapin.Ico ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: sqlgui.rll#70.ico ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: Closed.ico ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: Happy.ico ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: SmallOpenImage.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: Open.ico ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: sqlgui.rll#71.ico ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: LargeImage.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: sqlns.rll#301.ico ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: SmallImage.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: Main.ico ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: SuperToolBar.bmp ---
(This appears to be a binary file; contents omitted.)

[Mmclibrary-cvs] mmclibrary/VBNETSnapin/images - New directory

[Alexander K. <kac...@us...>]

Update of /cvsroot/mmclibrary/mmclibrary/VBNETSnapin/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31047/images

Log Message:
Directory /cvsroot/mmclibrary/mmclibrary/VBNETSnapin/images added to the repository

[Mmclibrary-cvs] mmclibrary/MMCLib2/PropertyPages PropertyPageSettings.cs,NONE,1.1 PropertyPage.cs,1.5,1.6 PropertyPageBase.cs,1.6,1.7 PropertySheet.cs,1.11,1.12

[Lesley v. Z. <ex...@us...>]

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

Modified Files:
	PropertyPage.cs PropertyPageBase.cs PropertySheet.cs 
Added Files:
	PropertyPageSettings.cs 
Log Message:
PropertyPage.cs
	- added DeactivateApply() to deactivate the apply button manualy
	- fixed a typo

PropertyPageBase.cs
	- added DeactivateApplyBtn event handler

PropertySheet.cs
	- added DeactivateApplyButton function to deactivate the apply button manualy
	- Added UseCancelDialogs on/off behaviour

PropertyPageSettings.cs
	- Added this Threadsafe Singleton class to hold global propertypage settings


Index: PropertyPageBase.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/PropertyPages/PropertyPageBase.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PropertyPageBase.cs	15 Nov 2004 19:43:49 -0000	1.6
--- PropertyPageBase.cs	5 Dec 2004 03:22:13 -0000	1.7
***************
*** 148,151 ****
--- 148,156 ----
  		}
  
+ 		protected void DeactivateApplyBtn(object sender, System.EventArgs e)
+ 		{
+ 			this.m_propertypage.PropertySheet.DeactivateApplyButton();
+ 		}
+ 
  		#region Event handling
  		private void onApplyEvent(object sender, System.EventArgs e) {			

--- NEW FILE: PropertyPageSettings.cs ---
using System;

namespace Ironring.MMC.PropertyPages
{
	/// <summary>
	/// Singleton class for propertypage settings
	/// can only think of 1 setting right now, but this is easier for the future
	/// </summary>
	public sealed class PropertyPageSettings
	{
		#region threadsafe singleton design pattern implementation
		readonly static PropertyPageSettings _instance = new PropertyPageSettings();

		// hack not to mark type as beforefieldinit
		static PropertyPageSettings() {}
		
		// default ctor
		PropertyPageSettings() {}

		public static PropertyPageSettings Instance 
		{	
			get { return _instance; }
		}
		#endregion

		#region private helpers
		bool _useCancelDialogs = true;

		#endregion

		#region Properties

		public bool UseCancelDialogs
		{
			get{return _useCancelDialogs;}
			set{_useCancelDialogs = value;}
		}

		#endregion
	}
}

Index: PropertySheet.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/PropertyPages/PropertySheet.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PropertySheet.cs	15 Nov 2004 19:43:49 -0000	1.11
--- PropertySheet.cs	5 Dec 2004 03:22:13 -0000	1.12
***************
*** 345,349 ****
  		void onCancelClick(Object o, EventArgs e)
  		{
! 			if(IsApplyEnabled() == true)
  			{
  				switch(MessageBox.Show("Some property data may have changed.  Do you want to save your changes?", 
--- 345,349 ----
  		void onCancelClick(Object o, EventArgs e)
  		{
! 			if(IsApplyEnabled() == true && PropertyPageSettings.Instance.UseCancelDialogs == true)
  			{
  				switch(MessageBox.Show("Some property data may have changed.  Do you want to save your changes?", 
***************
*** 407,410 ****
--- 407,418 ----
  		}
  
+ 		/// <summary>
+ 		/// Turn off the apply button
+ 		/// </summary>
+ 		public void DeactivateApplyButton()
+ 		{
+ 			if(m_btnApply != null)
+ 				m_btnApply.Enabled = false;
+ 		}
  
  		/// <summary>

Index: PropertyPage.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/PropertyPages/PropertyPage.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PropertyPage.cs	15 Nov 2004 19:43:49 -0000	1.5
--- PropertyPage.cs	5 Dec 2004 03:22:13 -0000	1.6
***************
*** 156,160 ****
  
  		/// <summary>
! 		/// The string displayed int he tab
  		/// </summary>
  		public String Title
--- 156,160 ----
  
  		/// <summary>
! 		/// The string displayed in the tab
  		/// </summary>
  		public String Title
***************
*** 313,316 ****
--- 313,324 ----
  		}
  
+ 		/// <summary>
+ 		/// Method to call that turns off the apply button
+ 		/// </summary>
+ 		protected void DeactivateApply()
+ 		{
+ 			m_PropSheet.DeactivateApplyButton();
+ 		}
+ 
  	}
  }

[Mmclibrary-cvs] mmclibrary/MMCTest2 MyPropertyPage.cs,1.4,1.5

[Lesley v. Z. <ex...@us...>]

Update of /cvsroot/mmclibrary/mmclibrary/MMCTest2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16535

Modified Files:
	MyPropertyPage.cs 
Log Message:
no message

Index: MyPropertyPage.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest2/MyPropertyPage.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MyPropertyPage.cs	15 Nov 2004 19:47:24 -0000	1.4
--- MyPropertyPage.cs	15 Nov 2004 20:14:38 -0000	1.5
***************
*** 44,48 ****
  		}
  
! 		protected override void fancyName()
  		{
  			m_node.AddChild(new BaseNode(m_snapin, "tryout", "", ""));
--- 44,48 ----
  		}
  
! 		protected override void InvokeMmcAfterClose()
  		{
  			m_node.AddChild(new BaseNode(m_snapin, "tryout", "", ""));

[Mmclibrary-cvs] mmclibrary/MMCTest2 TestNode.cs,NONE,1.1 MMCTest2.csproj,1.9,1.10 MyPropertyPage.cs,1.3,1.4 MyPropertyPageForItems.cs,1.4,1.5

[Lesley v. Z. <ex...@us...>]

Update of /cvsroot/mmclibrary/mmclibrary/MMCTest2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10662

Modified Files:
	MMCTest2.csproj MyPropertyPage.cs MyPropertyPageForItems.cs 
Added Files:
	TestNode.cs 
Log Message:
updated to adopt changes

--- NEW FILE: TestNode.cs ---
using System;
using Ironring.MMC.Nodes;
using Ironring.MMC.Core;
using System.Collections;

namespace MMCTest2
{
	
	
	public class TestNode : ReportNode 
	{
		public static ResultViewColumn col1 = new ResultViewColumn("Name", (int)ColumnHeaderFormat.LEFT, 100);

		BaseNode node1,node2;

		public TestNode(SnapinBase snapin, String displayName, String closedIco, String openIco) : base(snapin, displayName, closedIco, openIco)
		{
			node1 = new BaseNode(Snapin,"test1","","");
			node2 = new BaseNode(Snapin,"test2","","");

			this.MultiSelectMode = true;
			this.AddChild(node1);
			this.AddChild(node2);
		}

		public override ArrayList Items
		{
			get
			{
				ArrayList items = new ArrayList();
				for(int i=0;i<5;i++)
					items.Add(new ResultViewItem(this.Snapin,this,i.ToString()));
				return items;
			}
		}

		public override ArrayList Columns
		{
			get
			{
				ArrayList a = new ArrayList();
				a.Add(col1);
				return a;
			}
		}

		public override ArrayList Menus
		{
			get
			{
				ArrayList l = new ArrayList(1);
				l.Add(new MenuItem("remove subnodes", "remove the child nodes", new MenuCommandHandler(deleteHandler)));
				l.Add(new MenuItem("add subnodes", "add some child nodes", new MenuCommandHandler(addHandler)));
				return l;
			}
		}

		private void deleteHandler(object o, BaseNode node)
		{
			node1.Remove(false);
			node2.Remove(false);

			m_ChildNodes.Clear();

			Snapin.SelectScopeNode(this);
		}

		private void addHandler(object o, BaseNode node)
		{
			this.AddChild(new BaseNode(Snapin, "a", "", ""));
			this.AddChild(new BaseNode(Snapin, "b", "", ""));
			this.AddChild(new BaseNode(Snapin, "c", "", ""));

			InsertChildren();
		}


		public override string GetResultViewType(ref int pViewOptions)
		{
			string returnValue = base.GetResultViewType(ref pViewOptions);
			pViewOptions |= (int)MMC_VIEW_OPTIONS.EXCLUDE_SCOPE_ITEMS_FROM_LIST;
			return returnValue;
		}

		public override string ResultViewSmallImage
		{
			get
			{
				return "MMCTest2.images.snapin.Ico";
			}
		}

		public override string ResultViewLargeImage
		{
			get
			{
				return "MMCTest2.images.snapin.Ico";
			}
		}
	}
}

Index: MyPropertyPageForItems.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest2/MyPropertyPageForItems.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MyPropertyPageForItems.cs	15 Apr 2004 10:20:24 -0000	1.4
--- MyPropertyPageForItems.cs	15 Nov 2004 19:47:24 -0000	1.5
***************
*** 25,29 ****
  		}
  
! 		public override void init()
  		{
  			this.tbName.Text = SelectedResultItem.DisplayName;
--- 25,29 ----
  		}
  
! 		public override void Init()
  		{
  			this.tbName.Text = SelectedResultItem.DisplayName;

Index: MMCTest2.csproj
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest2/MMCTest2.csproj,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MMCTest2.csproj	7 Nov 2004 14:45:32 -0000	1.9
--- MMCTest2.csproj	15 Nov 2004 19:47:24 -0000	1.10
***************
*** 131,135 ****
                  <File
                      RelPath = "MyPropertyPage.cs"
!                     SubType = "Code"
                      BuildAction = "Compile"
                  />
--- 131,135 ----
                  <File
                      RelPath = "MyPropertyPage.cs"
!                     SubType = "UserControl"
                      BuildAction = "Compile"
                  />
***************
*** 141,145 ****
                  <File
                      RelPath = "MyPropertyPageForItems.cs"
!                     SubType = "Code"
                      BuildAction = "Compile"
                  />
--- 141,145 ----
                  <File
                      RelPath = "MyPropertyPageForItems.cs"
!                     SubType = "UserControl"
                      BuildAction = "Compile"
                  />
***************
*** 176,180 ****
                  <File
                      RelPath = "TestSnapinBase.cs"
!                     SubType = "Code"
                      BuildAction = "Compile"
                  />
--- 176,180 ----
                  <File
                      RelPath = "TestSnapinBase.cs"
!                     SubType = "Component"
                      BuildAction = "Compile"
                  />

Index: MyPropertyPage.cs
===================================================================
RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest2/MyPropertyPage.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MyPropertyPage.cs	31 Mar 2004 07:58:46 -0000	1.3
--- MyPropertyPage.cs	15 Nov 2004 19:47:24 -0000	1.4
***************
*** 4,7 ****
--- 4,9 ----
  using System.Drawing;
  using System.Windows.Forms;
+ 
+ using Ironring.MMC.Core;
  using Ironring.MMC.Nodes;
  
***************
*** 16,32 ****
  		private System.ComponentModel.IContainer components = null;
  
  		public MyPropertyPage()
  		{
  			InitializeComponent();
- 			//tbNodeName.Text = Node.DisplayName;
- 			//tbNodeType.Text = Node.GetType().ToString();
  		}
! 		private void OnInit()
  		{
! 			BaseNode node = this.PropertyPage.PropertySheet.Node;
! 			tbNodeName.Text = node.DisplayName;
! 			tbNodeType.Text = node.GetType().ToString();
  		}
  
  		/// <summary>
  		/// Clean up any resources being used.
--- 18,54 ----
  		private System.ComponentModel.IContainer components = null;
  
+ 		BaseNode m_node;
+ 		SnapinBase m_snapin;
+ 
  		public MyPropertyPage()
  		{
  			InitializeComponent();
  		}
! 
! 		//private void OnInit()
! 		public override void Init()
  		{
! 			m_node = this.PropertyPage.PropertySheet.Node;
! 			m_snapin = m_node.Snapin;
! 			tbNodeName.Text = m_node.DisplayName;
! 			tbNodeType.Text = m_node.GetType().ToString();
! 			this.tbNodeName.TextChanged+=new EventHandler(ActivateApplyBtn);
! 			base.Init ();
  		}
  
+ 		public override void onApply()
+ 		{
+ 			//m_node.AddChild(new BaseNode(m_snapin, "tryout", "", ""));
+ 			//m_node.InsertChildren();
+ 			base.onApply();
+ 		}
+ 
+ 		protected override void fancyName()
+ 		{
+ 			m_node.AddChild(new BaseNode(m_snapin, "tryout", "", ""));
+ 			m_node.InsertChildren();
+ 		}
+ 
+ 
  		/// <summary>
  		/// Clean up any resources being used.
***************
*** 96,109 ****
  			this.Controls.Add(this.tbNodeName);
  			this.Name = "MyPropertyPage";
- 			this.Paint += new System.Windows.Forms.PaintEventHandler(this.MyPropertyPage_Paint);
  			this.ResumeLayout(false);
  
  		}
  		#endregion
- 
- 		private void MyPropertyPage_Paint(object sender, System.Windows.Forms.PaintEventArgs e)
- 		{
- 			OnInit();
- 		}
  	}
  }
--- 118,125 ----