|
From: Alexander K. <kac...@us...> - 2005-03-25 07:55:43
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4995/MMCLib Modified Files: AssemblyInfo.cs BaseNode.cs Component.cs MMCLib.xml _ChangeLog.txt Log Message: Index: MMCLib.xml =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib/MMCLib.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** MMCLib.xml 21 Mar 2005 20:14:08 -0000 1.14 --- MMCLib.xml 25 Mar 2005 07:55:34 -0000 1.15 *************** *** 680,692 **** </summary> </member> ! <member name="M:Ironring.Management.MMC.BaseNode.OnShow(System.Boolean)"> <summary> ! Show the Node </summary> - <param name="bSelecting">TRUE if selecting, FALSE if deselecting</param> - <remarks> - TRUE if selecting. Indicates that the snap-in should set up the result pane and add the enumerated items. - FALSE if deselecting. Indicates that the snap-in is going out of focus and that it should clean up all result item cookies, because the current result pane will be replaced by a new one. - </remarks> </member> <member name="M:Ironring.Management.MMC.BaseNode.OnControlbarCommand(Ironring.Management.MMC.IControlbar,Ironring.Management.MMC.IToolbar,Ironring.Management.MMC.MMC_CONSOLE_VERB)"> --- 680,687 ---- </summary> </member> ! <member name="M:Ironring.Management.MMC.BaseNode.OnHide"> <summary> ! Hide the Node </summary> </member> <member name="M:Ironring.Management.MMC.BaseNode.OnControlbarCommand(Ironring.Management.MMC.IControlbar,Ironring.Management.MMC.IToolbar,Ironring.Management.MMC.MMC_CONSOLE_VERB)"> *************** *** 700,708 **** </summary> </member> ! <member name="M:Ironring.Management.MMC.BaseNode.OnPaste(Ironring.Management.MMC.IDataObject)"> <summary> Paste the ido item </summary> <param name="ido">IDataObject of item to be pasted</param> <returns></returns> </member> --- 695,704 ---- </summary> </member> ! <member name="M:Ironring.Management.MMC.BaseNode.OnPaste(Ironring.Management.MMC.IDataObject,System.Boolean)"> <summary> Paste the ido item </summary> <param name="ido">IDataObject of item to be pasted</param> + <param name="copy">If the source item should be copied (as opposed to cut)</param> <returns></returns> </member> *************** *** 3278,3282 **** </member> <member name="P:Ironring.Management.MMC.WizardBase.SelectedPage"> ! Submitеed by Johnson Chu <summary> Allow go back to the first page --- 3274,3278 ---- </member> <member name="P:Ironring.Management.MMC.WizardBase.SelectedPage"> ! Submitåed by Johnson Chu <summary> Allow go back to the first page Index: _ChangeLog.txt =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib/_ChangeLog.txt,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** _ChangeLog.txt 9 Nov 2004 07:29:52 -0000 1.19 --- _ChangeLog.txt 25 Mar 2005 07:55:34 -0000 1.20 *************** *** 1,5 **** ver 1.6.7 - Applied patches: ! [ 1047351 ] Changes for Spanish Translated property pages ((Thanks to joe) [ 1025067 ] Column sorting for non-string datatypes (Thanks to Greg Arnold) [ 1024677 ] ENH: re-using user control instances (Thanks to Kent Rollins) --- 1,12 ---- + ver 1.6.8 + - Applied patches: + [ 1168621 ] Cut And Paste Patch (1.6.5) (Thanks to Chris Osborn) + + Alexander Kachalkov: + - Toolbar ToolbarButtons and ToolbarImageIndex are now static + ver 1.6.7 - Applied patches: ! [ 1047351 ] Changes for Spanish Translated property pages (Thanks to joe) [ 1025067 ] Column sorting for non-string datatypes (Thanks to Greg Arnold) [ 1024677 ] ENH: re-using user control instances (Thanks to Kent Rollins) Index: AssemblyInfo.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib/AssemblyInfo.cs,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** AssemblyInfo.cs 15 Mar 2005 06:16:55 -0000 1.12 --- AssemblyInfo.cs 25 Mar 2005 07:55:33 -0000 1.13 *************** *** 10,16 **** [assembly: AssemblyDescription("MMC .NET Library - managed wrapper library to support MMC snapin development for Windows")] [assembly: AssemblyConfiguration("")] ! [assembly: AssemblyCompany("Ironring Software 2004")] [assembly: AssemblyProduct("MMC .NET Library")] ! [assembly: AssemblyCopyright("Ironring Software 2004")] [assembly: AssemblyTrademark("MMC .NET Library")] [assembly: AssemblyCulture("")] --- 10,16 ---- [assembly: AssemblyDescription("MMC .NET Library - managed wrapper library to support MMC snapin development for Windows")] [assembly: AssemblyConfiguration("")] ! [assembly: AssemblyCompany("Ironring Software 2005")] [assembly: AssemblyProduct("MMC .NET Library")] ! [assembly: AssemblyCopyright("Ironring Software 2005")] [assembly: AssemblyTrademark("MMC .NET Library")] [assembly: AssemblyCulture("")] Index: BaseNode.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib/BaseNode.cs,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** BaseNode.cs 15 Mar 2005 06:16:55 -0000 1.30 --- BaseNode.cs 25 Mar 2005 07:55:34 -0000 1.31 *************** *** 373,376 **** --- 373,377 ---- protected static object OnDeselectResultKey = new object(); protected static object OnShowKey = new object(); + protected static object OnHideKey = new object(); protected static object OnViewChangeScopeKey = new object(); protected static object OnViewChangeResultKey = new object(); *************** *** 1414,1429 **** } - //Added by Alexander Kachalkov /// <summary> ! /// Show the Node /// </summary> ! /// <param name="bSelecting">TRUE if selecting, FALSE if deselecting</param> ! /// <remarks> ! /// TRUE if selecting. Indicates that the snap-in should set up the result pane and add the enumerated items. ! /// FALSE if deselecting. Indicates that the snap-in is going out of focus and that it should clean up all result item cookies, because the current result pane will be replaced by a new one. ! /// </remarks> ! public virtual void OnShow(bool bSelecting) { ! m_events.Fire(OnShowKey, this, null); } --- 1415,1424 ---- } /// <summary> ! /// Hide the Node /// </summary> ! public virtual void OnHide() { ! m_events.Fire(OnHideKey, this, null); } *************** *** 1472,1477 **** /// </summary> /// <param name="ido">IDataObject of item to be pasted</param> /// <returns></returns> ! public virtual bool OnPaste(IDataObject ido) { bool retval = false; --- 1467,1473 ---- /// </summary> /// <param name="ido">IDataObject of item to be pasted</param> + /// <param name="copy">If the source item should be copied (as opposed to cut)</param> /// <returns></returns> ! public virtual bool OnPaste(IDataObject ido, bool copy) { bool retval = false; Index: Component.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib/Component.cs,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Component.cs 18 Mar 2005 18:09:44 -0000 1.20 --- Component.cs 25 Mar 2005 07:55:34 -0000 1.21 *************** *** 293,312 **** break; } ! case MMCN_Notify.PASTE: ! { ! // TBD: arg = IDataObject for multi select ! // param = NULL for move as opposed to cut ! // = BOOL* for for single item pasting...return TRUE if good ! // = IDataObject for multiselect paste ! // return S_FALSE for no can do or S_OK if...OK ! // node.OnPaste(); ! //Changed by Wojciech Sobocinski ** defaults to cut right now IDataObject anido = (IDataObject)Marshal.GetObjectForIUnknown(arg); ! if(node.OnPaste(anido)) { ! // // need to set the param ptr ! // ! param = Marshal.GetIUnknownForObject(anido); } else --- 293,313 ---- break; } ! case MMCN_Notify.PASTE: ! { ! // lpDataObject = The data object of the destination scope item in which to paste the selected items provided by the snap-in. ! // arg = The data object of the selected item(s) provided by the source snap-in that needs to be pasted. ! // param = NULL for copy (as opposed to cut) ! // = BOOL* for for single item pasting...return TRUE if good ! // = IDataObject for multiselect paste ! // return S_FALSE for no can do or S_OK if...OK IDataObject anido = (IDataObject)Marshal.GetObjectForIUnknown(arg); ! ! bool bCopy = (param == IntPtr.Zero); ! if(node.OnPaste(anido, bCopy)) { ! // need to set the param ptr ! if(!bCopy) ! param = Marshal.GetIUnknownForObject(anido); } else *************** *** 411,417 **** if (bSelecting) theNode.OnShow(); ! ! // Added by Alexander Kachalkov ! theNode.OnShow(bSelecting); break; --- 412,417 ---- if (bSelecting) theNode.OnShow(); ! else ! theNode.OnHide(); break; |
