mmclibrary-cvs Mailing List for MMC .NET Library (Page 2)
Brought to you by:
imjimmurphy,
kachalkov
Menu
▾
▴
mmclibrary-cvs — MMC Library CVS Checkins
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(17) |
Apr
(96) |
May
(15) |
Jun
(1) |
Jul
(43) |
Aug
(4) |
Sep
(11) |
Oct
(8) |
Nov
(15) |
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(31) |
Feb
|
Mar
(24) |
Apr
(6) |
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: Alexander K. <kac...@us...> - 2005-03-15 06:17:09
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib/bin/Release In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19680/MMCLib/bin/Release Added Files: Interop.SHDocVw.dll Log Message: --- NEW FILE: Interop.SHDocVw.dll --- (This appears to be a binary file; contents omitted.) |
|
From: Alexander K. <kac...@us...> - 2005-03-15 06:17:08
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCTest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19680/MMCTest Modified Files: MMCTest.csproj MMCTest.csproj.user TestSnapin.cs Log Message: Index: MMCTest.csproj.user =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest/MMCTest.csproj.user,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MMCTest.csproj.user 22 Apr 2004 11:56:00 -0000 1.7 --- MMCTest.csproj.user 15 Mar 2005 06:16:55 -0000 1.8 *************** *** 12,16 **** RemoteDebugMachine = "" StartAction = "Program" ! StartArguments = '"D:\Docs\IDC\MMC Snapin Framework\MMCTest\MMCTest.msc" ' StartPage = "" StartProgram = "c:\windows\system32\mmc.exe" --- 12,16 ---- RemoteDebugMachine = "" StartAction = "Program" ! StartArguments = '"..\..\MMCTest.msc" ' StartPage = "" StartProgram = "c:\windows\system32\mmc.exe" *************** *** 18,22 **** StartWorkingDirectory = "" StartWithIE = "true" ! /> <Config Name = "Release" --- 18,28 ---- StartWorkingDirectory = "" StartWithIE = "true" ! > ! <InteropRegistration ! RegisteredComClassic = "true" ! RegisteredOutput = "MMCTest.dll" ! RegisteredTypeLib = "MMCTest.tlb" ! /> ! </Config> <Config Name = "Release" Index: MMCTest.csproj =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest/MMCTest.csproj,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** MMCTest.csproj 9 Nov 2004 07:29:53 -0000 1.14 --- MMCTest.csproj 15 Mar 2005 06:16:55 -0000 1.15 *************** *** 145,149 **** <File RelPath = "TestSnapin.cs" ! SubType = "Component" BuildAction = "Compile" /> --- 145,149 ---- <File RelPath = "TestSnapin.cs" ! SubType = "Code" BuildAction = "Compile" /> *************** *** 175,179 **** <File RelPath = "WzdSnapinManager.cs" ! SubType = "UserControl" BuildAction = "Compile" /> --- 175,179 ---- <File RelPath = "WzdSnapinManager.cs" ! SubType = "Code" BuildAction = "Compile" /> *************** *** 185,189 **** <File RelPath = "WzdTest1.cs" ! SubType = "UserControl" BuildAction = "Compile" /> --- 185,189 ---- <File RelPath = "WzdTest1.cs" ! SubType = "Code" BuildAction = "Compile" /> *************** *** 195,199 **** <File RelPath = "WzdTest2.cs" ! SubType = "UserControl" BuildAction = "Compile" /> --- 195,199 ---- <File RelPath = "WzdTest2.cs" ! SubType = "Code" BuildAction = "Compile" /> Index: TestSnapin.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest/TestSnapin.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TestSnapin.cs 13 Feb 2004 12:19:51 -0000 1.11 --- TestSnapin.cs 15 Mar 2005 06:16:56 -0000 1.12 *************** *** 441,445 **** { BaseNode selNode = (BaseNode)sender; ! SetToolbarValueArgs e = (SetToolbarValueArgs)args; if (e.Toolbar == null) return; --- 441,445 ---- { BaseNode selNode = (BaseNode)sender; ! SetToolbarArgs e = (SetToolbarArgs)args; if (e.Toolbar == null) return; *************** *** 453,457 **** { BaseNode selNode = (BaseNode)sender; ! ToolbarCommandValueArgs e = (ToolbarCommandValueArgs)args; System.Windows.Forms.MessageBox.Show(String.Format("Toolbar button ¹ {0} pressed!", Convert.ToString(e.verb)), "Node_OnToolbarCommandEvent"); --- 453,457 ---- { BaseNode selNode = (BaseNode)sender; ! ToolbarCommandArgs e = (ToolbarCommandArgs)args; System.Windows.Forms.MessageBox.Show(String.Format("Toolbar button ¹ {0} pressed!", Convert.ToString(e.verb)), "Node_OnToolbarCommandEvent"); |
|
From: Alexander K. <kac...@us...> - 2005-03-15 05:56:26
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib/bin/Release In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14798/Release Log Message: Directory /cvsroot/mmclibrary/mmclibrary/MMCLib/bin/Release added to the repository |
|
From: Alexander K. <kac...@us...> - 2005-03-15 05:56:26
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib/bin/Debug In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14798/Debug Log Message: Directory /cvsroot/mmclibrary/mmclibrary/MMCLib/bin/Debug added to the repository |
|
From: Alexander K. <kac...@us...> - 2005-03-15 05:56:07
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14681/bin Log Message: Directory /cvsroot/mmclibrary/mmclibrary/MMCLib/bin added to the repository |
|
From: Lesley v. Z. <ex...@us...> - 2005-03-07 06:59:15
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4274 Modified Files: MMCLib2.csproj Log Message: i18n changes Index: MMCLib2.csproj =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/MMCLib2.csproj,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** MMCLib2.csproj 5 Dec 2004 15:43:44 -0000 1.13 --- MMCLib2.csproj 7 Mar 2005 06:59:05 -0000 1.14 *************** *** 19,23 **** PreBuildEvent = "" PostBuildEvent = "" ! RootNamespace = "MMCLib2" RunPostBuildEvent = "OnBuildSuccess" StartupObject = "" --- 19,23 ---- PreBuildEvent = "" PostBuildEvent = "" ! RootNamespace = "Ironring.MMC" RunPostBuildEvent = "OnBuildSuccess" StartupObject = "" *************** *** 291,294 **** --- 291,302 ---- /> <File + RelPath = "Resources\i18n.nl.resx" + BuildAction = "EmbeddedResource" + /> + <File + RelPath = "Resources\i18n.resx" + BuildAction = "EmbeddedResource" + /> + <File RelPath = "Wizards\WizardBase.cs" SubType = "Form" |
|
From: Lesley v. Z. <ex...@us...> - 2005-03-05 00:18:00
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4839 Modified Files: BaseNode.cs Log Message: fixed to very stupid mistakes thanks to CAJAZZER - cajazzer Index: BaseNode.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/BaseNode.cs,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** BaseNode.cs 2 Mar 2005 13:28:11 -0000 1.30 --- BaseNode.cs 5 Mar 2005 00:17:51 -0000 1.31 *************** *** 1995,1999 **** // Now add all the children images foreach(BaseNode node in this.Children) ! AddResultPaneChildrenImages(il); _events.Fire(OnAddResultPaneImagesKey, this, new AddImagesArgs(il)); --- 1995,1999 ---- // Now add all the children images foreach(BaseNode node in this.Children) ! node.AddResultPaneChildrenImages(il); _events.Fire(OnAddResultPaneImagesKey, this, new AddImagesArgs(il)); *************** *** 2004,2008 **** { if (ResultPaneImages != null) ! ResultPaneImages.LoadImageList(il, m_iCookie); } --- 2004,2008 ---- { if (ResultPaneImages != null) ! ResultPaneImages.LoadImageList(il, _iCookie); } |
|
From: Lesley v. Z. <ex...@us...> - 2005-03-02 13:28:23
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8736 Modified Files: BaseNode.cs Log Message: https://sourceforge.net/forum/message.php?msg_id=3008415 Index: BaseNode.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/BaseNode.cs,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** BaseNode.cs 19 Jan 2005 22:58:40 -0000 1.29 --- BaseNode.cs 2 Mar 2005 13:28:11 -0000 1.30 *************** *** 50,54 **** private OnUserDelegate _updateHandle = null; - /// <summary> /// Back reference to the snapin --- 50,53 ---- *************** *** 945,949 **** /// to display data items in the result pane. This function /// is used to get data both for a column view and a list view. ! /// TBD: trim down for basic list view only - reporting stuff is in reportnode /// </summary> /// <param name="ResultDataItem"></param> --- 944,948 ---- /// to display data items in the result pane. This function /// is used to get data both for a column view and a list view. ! /// #TODO: trim down for basic list view only - reporting stuff is in reportnode /// </summary> /// <param name="ResultDataItem"></param> *************** *** 1996,2004 **** // Now add all the children images foreach(BaseNode node in this.Children) ! node.OnAddResultPaneImages(il); _events.Fire(OnAddResultPaneImagesKey, this, new AddImagesArgs(il)); } protected virtual int GetResultViewImageIndex() { --- 1995,2010 ---- // Now add all the children images foreach(BaseNode node in this.Children) ! AddResultPaneChildrenImages(il); _events.Fire(OnAddResultPaneImagesKey, this, new AddImagesArgs(il)); } + // Added thanks to Oleg - kojevnikov + private void AddResultPaneChildrenImages(IImageList il) + { + if (ResultPaneImages != null) + ResultPaneImages.LoadImageList(il, m_iCookie); + } + protected virtual int GetResultViewImageIndex() { |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-22 02:06:46
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/Core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32507 Modified Files: Component.cs Log Message: Added checks to check current running version of mmc Index: Component.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Core/Component.cs,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Component.cs 19 Jan 2005 22:18:45 -0000 1.18 --- Component.cs 22 Jan 2005 02:06:37 -0000 1.19 *************** *** 126,130 **** public void Initialize(Object pConsole) { ! _console = pConsole as IConsole2; } --- 126,142 ---- public void Initialize(Object pConsole) { ! IMMCVersionInfo versionInfo = pConsole as IMMCVersionInfo; // doesn't work without platform sdk ? ! IConsole3 testConsole = pConsole as IConsole3; // introduced in mmc2 ! IColumnData columnData = pConsole as IColumnData; // introduced in mmc1.2 ! _console = pConsole as IConsole2; // introduced in mmc1.1 ! ! if(versionInfo != null || testConsole != null) ! _snapin.MMCVersion = MMC_VERSION.MMCv20; ! else if(columnData != null && _console != null) ! _snapin.MMCVersion = MMC_VERSION.MMCv12; ! else if(_console != null) ! _snapin.MMCVersion = MMC_VERSION.MMCv11; ! else ! _snapin.MMCVersion = MMC_VERSION.MMCv10; } *************** *** 926,930 **** /// </summary> /// <param name="i"></param> - /// <remarks>FIXME according to the msdn this needs to be a HRESULT Destroy();</remarks> public void Destroy(int i) { --- 938,941 ---- |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-22 01:38:43
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/Core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26527 Modified Files: SnapinBase.cs Log Message: Added property to check current running version of mmc Index: SnapinBase.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Core/SnapinBase.cs,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** SnapinBase.cs 19 Jan 2005 22:39:15 -0000 1.21 --- SnapinBase.cs 22 Jan 2005 01:38:34 -0000 1.22 *************** *** 67,70 **** --- 67,71 ---- private System.Windows.Forms.ContextMenu _filterMenu; private static ResourceManager _translator; + private MMC_VERSION _mmcVersion; #endregion *************** *** 177,180 **** --- 178,190 ---- } + /// <summary> + /// Cached MMCVersion + /// </summary> + public MMC_VERSION MMCVersion + { + get{ return _mmcVersion;} + set{ _mmcVersion = value; } + } + #endregion |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-22 01:21:41
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22872 Modified Files: Interfaces.cs Log Message: Added mmc 2 interfaces but not used them in the actual code (except IConsole3 for the finding out what version of mmc is running) The interfaces aren't corrent, the guids are right but the function parameters won't be correct, I pasted the original under it, will fix when needed Index: Interfaces.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Interfaces.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Interfaces.cs 19 Jan 2005 22:07:34 -0000 1.7 --- Interfaces.cs 22 Jan 2005 01:21:25 -0000 1.8 *************** *** 65,68 **** --- 65,82 ---- [ + ComImport, + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("CCA0F2D2-82DE-41B5-BF47-3B2076273D5C") + ] + public interface IComponentData2 : IComponentData + { + HRESULT QueryDispatch(int cookie, uint type, out IntPtr ppDispatch); + + /* + HRESULT QueryDispatch([in] MMC_COOKIE cookie, [in] DATA_OBJECT_TYPES type, [out] LPDISPATCH* ppDispatch); + */ + }; + + [ ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), *************** *** 83,86 **** --- 97,119 ---- } + [ + ComImport, + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("79A2D615-4A10-4ED4-8C65-8633F9335095") + ] + public interface IComponent2 : IComponent + { + HRESULT QueryDispatch(int cookie, uint type, out IntPtr ppDispatch); + HRESULT GetResultViewType2(int cookie, ref RESULT_VIEW_TYPE_INFO pResultViewType); + HRESULT RestoreResultView(int cookie, RESULT_VIEW_TYPE_INFO pResultViewType); + + /* + HRESULT QueryDispatch([in] MMC_COOKIE cookie, [in] DATA_OBJECT_TYPES type, [out] LPDISPATCH* ppDispatch); + HRESULT GetResultViewType2([in] MMC_COOKIE cookie, [in, out] PRESULT_VIEW_TYPE_INFO pResultViewType); + HRESULT RestoreResultView([in] MMC_COOKIE cookie, [in] PRESULT_VIEW_TYPE_INFO pResultViewType); + */ + + } + [ ComImport, *************** *** 126,135 **** ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), ! Guid("4861A010-20F9-11d2-A510-00C04FB6DD2C") ] ! public interface ISnapinHelp2 { [PreserveSig()] int GetHelpTopic(out IntPtr lpCompiledHelpFile); [PreserveSig()] int GetLinkedTopics(out IntPtr lpCompiledHelpFiles); --- 159,177 ---- ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), ! Guid("A6B15ACE-DF59-11D0-A7DD-00C04FD909DD") ] ! public interface ISnapinHelp { [PreserveSig()] int GetHelpTopic(out IntPtr lpCompiledHelpFile); + } + + [ + ComImport, + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("4861A010-20F9-11d2-A510-00C04FB6DD2C") + ] + public interface ISnapinHelp2 : ISnapinHelp + { [PreserveSig()] int GetLinkedTopics(out IntPtr lpCompiledHelpFiles); *************** *** 175,181 **** ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), ! Guid("255F18CC-65DB-11D1-A7DC-00C04FD8D565") ] ! public interface IConsoleNameSpace2 { void InsertItem(ref SCOPEDATAITEM item); --- 217,223 ---- ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), ! Guid("BEDEB620-F24D-11cf-8AFC-00AA003CA9F6") ] ! public interface IConsoleNameSpace { void InsertItem(ref SCOPEDATAITEM item); *************** *** 186,200 **** void GetNextItem(uint item, ref uint pItemNext, ref int plCookie); void GetParentItem(uint item, ref uint pItemParent, ref int plCookie); void Expand(uint hItem); void AddExtension(CLSID hItem, ref SCOPEDATAITEM lpClsid); } - [ ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), ! Guid("9757abb8-1b32-11d1-a7ce-00c04fd8d565") ] ! public interface IHeaderCtrl2 { void InsertColumn(int nCol, [MarshalAs(System.Runtime.InteropServices.UnmanagedType.LPWStr)] string title, int nFormat, int nWidth); --- 228,250 ---- void GetNextItem(uint item, ref uint pItemNext, ref int plCookie); void GetParentItem(uint item, ref uint pItemParent, ref int plCookie); + } + + [ + ComImport, + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("255F18CC-65DB-11D1-A7DC-00C04FD8D565") + ] + public interface IConsoleNameSpace2 : IConsoleNameSpace + { void Expand(uint hItem); void AddExtension(CLSID hItem, ref SCOPEDATAITEM lpClsid); } [ ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), ! Guid("43136EB3-D36C-11CF-ADBC-00AA00A80033") ] ! public interface IHeaderCtrl { void InsertColumn(int nCol, [MarshalAs(System.Runtime.InteropServices.UnmanagedType.LPWStr)] string title, int nFormat, int nWidth); *************** *** 204,207 **** --- 254,266 ---- void SetColumnWidth(int nCol, int nWidth); void GetColumnWidth(int nCol, out int pWidth); + } + + [ + ComImport, + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("9757abb8-1b32-11d1-a7ce-00c04fd8d565") + ] + public interface IHeaderCtrl2 : IHeaderCtrl + { void SetChangeTimeOut( uint uTimeout); //void SetColumnFilter(uint nColumn, uint dwType, IntPtr pFilterData); *************** *** 238,241 **** --- 297,312 ---- ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("0F36E0EB-A7F1-4a81-BE5A-9247F7DE4B1B") + ] + public interface IResultData2 : IResultData + { + HRESULT RenameResultItem(uint itemID); + + + } + + [ + ComImport, + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("43136EB8-D36C-11CF-ADBC-00AA00A80033") ] *************** *** 249,258 **** ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), ! Guid("103D842A-AA63-11D1-A7E1-00C04FD8D565") ] ! public interface IConsole2 { void SetHeader(ref IHeaderCtrl2 pHeader); ! void SetToolbar([MarshalAs(UnmanagedType.Interface)] ref Object pToolbar); // Needs to be LPTOOLBAR void QueryResultView([MarshalAs(UnmanagedType.Interface)] out Object pUnknown); void QueryScopeImageList(out IImageList ppImageList); --- 320,329 ---- ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), ! Guid("43136EB1-D36C-11CF-ADBC-00AA00A80033") ] ! public interface IConsole { void SetHeader(ref IHeaderCtrl2 pHeader); ! void SetToolbar([MarshalAs(UnmanagedType.Interface)] ref Object pToolbar); // Needs to be LPTOOLBAR void QueryResultView([MarshalAs(UnmanagedType.Interface)] out Object pUnknown); void QueryScopeImageList(out IImageList ppImageList); *************** *** 264,267 **** --- 335,348 ---- void GetMainWindow(ref int phwnd); void NewWindow(int hScopeItem, uint lOptions); + } + + + [ + ComImport, + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("103D842A-AA63-11D1-A7E1-00C04FD8D565") + ] + public interface IConsole2 : IConsole + { void Expand(int hItem, int bExpand); void IsTaskpadViewPreferred(); *************** *** 269,272 **** --- 350,399 ---- } + [ + ComImport, + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("4F85EFDB-D0E1-498c-8D4A-D010DFDD404F") + ] + public interface IConsole3 : IConsole2 + { + void RenameScopeItem(int hScopeItem); + + /* + HRESULT RenameScopeItem([in] HSCOPEITEM hScopeItem); + */ + } + + [ComImport, + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("A8D2C5FE-CDCB-4B9D-BDE5-A27343FF54BC") + ] + public interface IMMCVersionInfo + { + HRESULT GetMMCVersion(out IntPtr pVersionMajor, out IntPtr pVersionMinor); + + /* + HRESULT GetMMCVersion([out] long * pVersionMajor, [out] long * pVersionMinor); + */ + + }; + + [ComImport, + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("547C1354-024D-11d3-A707-00C04F8EF4CB") + ] + public interface IColumnData + { + HRESULT SetColumnConfigData(IntPtr pColID, IntPtr pColSetData); + HRESULT GetColumnConfigData(IntPtr pColID, MMC_COLUMN_SET_DATA ppColSetData); + HRESULT SetColumnSortData(IntPtr pColID, IntPtr pColSortData); + HRESULT GetColumnSortData(IntPtr pColID, MMC_SORT_SET_DATA ppColSortData); + + /* + HRESULT SetColumnConfigData([in] SColumnSetID* pColID, [in] MMC_COLUMN_SET_DATA* pColSetData); + HRESULT GetColumnConfigData([in] SColumnSetID* pColID, [out] MMC_COLUMN_SET_DATA** ppColSetData); + HRESULT SetColumnSortData([in] SColumnSetID* pColID, [in] MMC_SORT_SET_DATA* pColSortData); + HRESULT GetColumnSortData([in] SColumnSetID* pColID, [out] MMC_SORT_SET_DATA** ppColSortData); + */ + }; *************** *** 298,301 **** --- 425,452 ---- ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("43136EB7-D36C-11CF-ADBC-00AA00A80033") + ] + public interface IContextMenuCallback2 + { + // returns S_OK if the item was added + // returns E_INVALIDARG if given a NULL pointer + // returns E_INVALIDARG if an item already exists with this lCommandID + // returns E_INVALIDARG if insertion point ID could not be found + // returns E_INVALIDARG if command ID or insertion point ID is invalid + // returns E_INVALIDARG if fFlags contains MF_OWNERDRAW or MF_BITMAP + // returns E_INVALIDARG if an extension attempts to add an item where + // fFlags contains MF_SEPARATOR or fSpecialFlags contains CCM_SPECIAL_SEPARATOR + // except in submenus created by extensions + // otherwise an unexpected error occurred + HRESULT AddItem(ref CONTEXTMENUITEM2 pItem); + + /* + HRESULT AddItem([in] CONTEXTMENUITEM2* pItem); + */ + } + + [ + ComImport, + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("69FB811E-6C1C-11D0-A2CB-00C04FD909DD") ] *************** *** 367,371 **** } ! [ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("E8315A52-7A1A-11D0-A2D2-00C04FD909DD") --- 518,523 ---- } ! [ ! ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("E8315A52-7A1A-11D0-A2D2-00C04FD909DD") *************** *** 376,379 **** --- 528,633 ---- } + [ + ComImport, + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("1cfbdd0e-62ca-49ce-a3af-dbb2de61b068") + ] + public interface IConsolePower + { + HRESULT SetExecutionState (uint dwAdd, uint dwRemove); + HRESULT ResetIdleTimer (uint dwFlags); + + /* + + HRESULT SetExecutionState ([in] DWORD dwAdd, [in] DWORD dwRemove); + HRESULT ResetIdleTimer ([in] DWORD dwFlags); + */ + } + + [ + ComImport, + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("3333759f-fe4f-4975-b143-fec0a5dd6d65") + ] + public interface IConsolePowerSink + { + HRESULT OnPowerBroadcast (uint nEvent, // power-management event + IntPtr lParam, // event-specific data + out int plReturn); // event-specific return code + + /* + HRESULT OnPowerBroadcast ( + [in] UINT nEvent, // power-management event + [in] LPARAM lParam, // event-specific data + [out] LRESULT* plReturn); // event-specific return code + */ + } + + [ + ComImport, + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("89995CEE-D2ED-4c0e-AE5E-DF7E76F3FA53") + ] + public interface IExtendView + { + HRESULT GetViews ( + IDataObject lpDataObject, + IViewExtensionCallback pViewExtensionCallback); + + /* + HRESULT GetViews ([in] LPDATAOBJECT pDataObject, [in] LPVIEWEXTENSIONCALLBACK pViewExtensionCallback); + */ + } + + [ + ComImport, + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("34DD928A-7599-41E5-9F5E-D6BC3062C2DA"), + ] + public interface IViewExtensionCallback + { + HRESULT AddView(MMC_EXT_VIEW_DATA pExtViewData); + + /* + HRESULT AddView([in] PMMC_EXT_VIEW_DATA pExtViewData); + */ + } + + [ + ComImport, + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("15BC4D24-A522-4406-AA55-0749537A6865"), + ] + public interface INodeProperties + { + HRESULT GetProperty(DataObject pDataObject, string szPropertyName, out string pbstrProperty); + + /* + HRESULT GetProperty([in] LPDATAOBJECT pDataObject, [in] BSTR szPropertyName, [out] PBSTR pbstrProperty); + */ + } + + + // HMPF, no info in mmc.idl + // ComImport, + // InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + // Guid("15BC4D24-A522-4406-AA55-0749537A6865"), + // ] + // public interface ISnapinProperties + // { + // + // } + // + // [ + // ComImport, + // InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + // Guid("15BC4D24-A522-4406-AA55-0749537A6865"), + // ] + // public interface ISnapinPropertiesCallback + // { + // + // } + + ////////////////////////////////////////////////////////////////////// // |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-22 01:20:03
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22373 Modified Files: Common.cs Log Message: Added mmc 2 structs and enums but not used them in the actual code Added MMC_VERSION enum to help find out what version is currently running Index: Common.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Common.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Common.cs 7 Nov 2004 14:44:36 -0000 1.9 --- Common.cs 22 Jan 2005 01:19:50 -0000 1.10 *************** *** 634,639 **** } ! ////////////////////////////////////////////////////////////////////// --- 634,701 ---- } ! public enum MMC_VERSION ! { ! MMCv10 = 10, ! MMCv11 = 11, ! MMCv12 = 12, ! MMCv20 = 20 ! } ! ! #region MMC2 enums + public enum ColumnSortOrder + { + SortOrder_Ascending = 0, + SortOrder_Descending = 1 + } + + public enum DocumentMode + { + DocumentMode_Author = 0, + DocumentMode_User = 1, + DocumentMode_User_MDI = 2, + DocumentMode_User_SDI = 3 + } + + public enum ExportListOptions + { + ExportListOptions_Default = 0x0000, + ExportListOptions_Unicode = 0x0001, + ExportListOptions_TabDelimited = 0x0002, + ExportListOptions_SelectedItemsOnly = 0x0004 + } + + public enum ListViewMode + { + ListMode_Small_Icons = 0, + ListMode_Large_Icons = 1, + ListMode_List = 2, + ListMode_Detail = 3, + ListMode_Filtered = 4 + } + + public enum MMC_PROPERTY_ACTION + { + MMC_PROPACT_DELETING = 1, + MMC_PROPACT_CHANGING, + MMC_PROPACT_INITIALIZED + } + + public enum MMC_VIEW_TYPE + { + MMC_VIEW_TYPE_LIST = 0, + MMC_VIEW_TYPE_HTML = MMC_VIEW_TYPE_LIST + 1, + MMC_VIEW_TYPE_OCX = MMC_VIEW_TYPE_HTML + 1 + } + + public enum ViewOptions + { + ViewOption_Default = 0x0000, + ViewOption_ScopeTreeHidden = 0x0001, + ViewOption_NoToolBars = 0x0002, + ViewOption_NotPersistable = 0x0004 + } + + #endregion ////////////////////////////////////////////////////////////////////// *************** *** 728,731 **** --- 790,907 ---- } + + + [ + StructLayout(LayoutKind.Sequential, + CharSet=CharSet.Auto) + ] + public struct MMC_COLUMN_DATA + { + int nColIndex; // Column index + uint dwFlags; // Column flags + int nWidth; // Column width + IntPtr ulReserved; // For future use + + /* + int nColIndex; + DWORD dwFlags; + int nWidth; + ULONG_PTR ulReserved; + */ + } + + + [ + StructLayout(LayoutKind.Sequential, + CharSet=CharSet.Auto) + ] + public struct MMC_COLUMN_SET_DATA + { + public int cbSize; // Size of this struct. + public int nNumCols; // Number of columns + public IntPtr pColData; // Array of column data + + /* + int cbSize; + int nNumCols; + MMC_COLUMN_DATA* pColData; + */ + } + + [ + StructLayout(LayoutKind.Sequential, + CharSet=CharSet.Auto) + ] + public struct MMC_SORT_DATA + { + int nColIndex; // Column index + uint dwSortOptions; // Column sort options + IntPtr ulReserved; // For future use + + /* + int nColIndex; + DWORD dwSortOptions; + ULONG_PTR ulReserved; + */ + } + + [ + StructLayout(LayoutKind.Sequential, + CharSet=CharSet.Auto) + ] + public struct MMC_SORT_SET_DATA + { + public int cbSize; // Size of this struct. + public int nNumItems; // Number of items in the array below. + public IntPtr pSortData; // Array of column data + + /* + int cbSize; + int nNumItems; + MMC_SORT_DATA* pSortData; + */ + + } + + public struct RESULT_VIEW_TYPE_INFO + { + public string pstrPersistableViewDescription; + public MMC_VIEW_TYPE eViewType; + public uint dwMiscOptions; + public uint options; + public object info_object; + + /* + LPOLESTR pstrPersistableViewDescription; + MMC_VIEW_TYPE eViewType; + DWORD dwMiscOptions; + + [switch_type(MMC_VIEW_TYPE), switch_is((MMC_VIEW_TYPE)eViewType)] + union + { + + [case(MMC_VIEW_TYPE_LIST)] + DWORD dwListOptions; + + [case(MMC_VIEW_TYPE_HTML)] + struct + { + DWORD dwHTMLOptions; // must be zero for future expansion. + LPOLESTR pstrURL; + }; + + [case(MMC_VIEW_TYPE_OCX)] + struct + { + DWORD dwOCXOptions; + LPUNKNOWN pUnkControl; + }; + + [default]; + */ + } + + + [ StructLayout(LayoutKind.Sequential, *************** *** 779,783 **** } - [ StructLayout(LayoutKind.Sequential) --- 955,958 ---- *************** *** 798,801 **** --- 973,1023 ---- StructLayout(LayoutKind.Sequential) ] + public struct CONTEXTMENUITEM2 + { + [MarshalAs(UnmanagedType.LPWStr)] + public string strName; + [MarshalAs(UnmanagedType.LPWStr)] + public string strStatusBarText; + public int lCommandID; + public uint lInsertionPointID; + public int fFlags; + public int fSpecialFlags; + [MarshalAs(UnmanagedType.LPWStr)] + public string strLanguageIndependentName; + + /* + LPWSTR strName; + LPWSTR strStatusBarText; + LONG lCommandID; + LONG lInsertionPointID; + LONG fFlags; + LONG fSpecialFlags; + LPWSTR strLanguageIndependentName; + */ + } + + public struct MMC_EXT_VIEW_DATA + { + public string viewID; // GUID used to describe the view. Used to restore a view. + public string pszURL; // URL describing extension page + public string pszViewTitle; // title of the view extension + + public string pszTooltipText; // tooltip for the tab + [MarshalAs(UnmanagedType.Bool)] + public bool bReplacesDefaultView; // TRUE == no "Normal" tab + + /* + GUID viewID; + LPCOLESTR pszURL; + LPCOLESTR pszViewTitle; + LPCOLESTR pszTooltipText; + BOOL bReplacesDefaultView; + */ + } + + + [ + StructLayout(LayoutKind.Sequential) + ] public struct SCOPEDATAITEM { *************** *** 1006,1008 **** --- 1228,1234 ---- + + + + } \ No newline at end of file |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-20 00:12:54
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCTest2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20892 Added Files: TestSnapinBase.resx Log Message: adopt mmclib2 changes 20-1-05 --- NEW FILE: TestSnapinBase.resx --- <?xml version="1.0" encoding="utf-8"?> <root> <!-- Microsoft ResX Schema Version 1.3 The primary goals of this format is to allow a simple XML format that is mostly human readable. The generation and parsing of the various data types are done through the TypeConverter classes associated with the data types. Example: ... ado.net/XML headers & schema ... <resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="version">1.3</resheader> <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> <data name="Name1">this is my long string</data> <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> [base64 mime encoded serialized .NET Framework object] </data> <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> [base64 mime encoded string representing a byte array form of the .NET Framework object] </data> There are any number of "resheader" rows that contain simple name/value pairs. Each data row contains a name, and value. The row also contains a type or mimetype. Type corresponds to a .NET class that support text/value conversion through the TypeConverter architecture. Classes that don't support this are serialized and stored with the mimetype set. The mimetype is used forserialized objects, and tells the ResXResourceReader how to depersist the object. This is currently not extensible. For a given mimetype the value must be set accordingly: Note - application/x-microsoft.net.object.binary.base64 is the format that the ResXResourceWriter will generate, however the reader can read any of the formats listed below. mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with : System.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 value : The object must be serialized with : System.Runtime.Serialization.Formatters.Soap.SoapFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.bytearray.base64 value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> <xsd:choice maxOccurs="unbounded"> <xsd:element name="data"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" /> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> </xsd:complexType> </xsd:element> <xsd:element name="resheader"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> </xsd:element> </xsd:choice> </xsd:complexType> </xsd:element> </xsd:schema> <resheader name="resmimetype"> <value>text/microsoft-resx</value> </resheader> <resheader name="version"> <value>1.3</value> </resheader> <resheader name="reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <data name="FilterMenu.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="FilterMenu.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </data> <data name="FilterMenu.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Public</value> </data> <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> <data name="$this.Name"> <value>TestSnapinBase</value> </data> </root> |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-20 00:11:04
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCTest2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20487 Modified Files: MMCTest2.csproj MyFormNode.cs MyPropertyPage.cs MyReportNode.cs TestSnapinBase.cs UserControl2.cs UserControl2.resx WzdAddItem.cs WzdSnapinManager.cs Log Message: adopt mmclib2 changes 20-1-05 Index: WzdAddItem.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest2/WzdAddItem.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WzdAddItem.cs 31 Mar 2004 07:58:46 -0000 1.3 --- WzdAddItem.cs 20 Jan 2005 00:10:51 -0000 1.4 *************** *** 59,73 **** // pictWizLogo // ! this.pictWizLogo.Name = "pictWizLogo"; // // lblExpandedDescription // ! this.lblExpandedDescription.Name = "lblExpandedDescription"; ! this.lblExpandedDescription.Text = "Fill in the following form"; // // lblPageCaption // ! this.lblPageCaption.Name = "lblPageCaption"; ! this.lblPageCaption.Text = "Add Item to List"; // // label1 --- 59,73 ---- // pictWizLogo // ! this.m_pictWizLogo.Name = "pictWizLogo"; // // lblExpandedDescription // ! this.m_lblExpandedDescription.Name = "lblExpandedDescription"; ! this.m_lblExpandedDescription.Text = "Fill in the following form"; // // lblPageCaption // ! this.m_lblPageCaption.Name = "lblPageCaption"; ! this.m_lblPageCaption.Text = "Add Item to List"; // // label1 Index: UserControl2.resx =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest2/UserControl2.resx,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** UserControl2.resx 31 Mar 2004 07:58:46 -0000 1.3 --- UserControl2.resx 20 Jan 2005 00:10:51 -0000 1.4 *************** *** 2,61 **** <root> <!-- ! Microsoft ResX Schema ! ! Version 1.3 ! The primary goals of this format is to allow a simple XML format ! that is mostly human readable. The generation and parsing of the ! various data types are done through the TypeConverter classes ! associated with the data types. ! ! Example: ! ! ... ado.net/XML headers & schema ... ! <resheader name="resmimetype">text/microsoft-resx</resheader> ! <resheader name="version">1.3</resheader> ! <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> ! <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> ! <data name="Name1">this is my long string</data> ! <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> ! <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> ! [base64 mime encoded serialized .NET Framework object] ! </data> ! <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> ! [base64 mime encoded string representing a byte array form of the .NET Framework object] ! </data> ! ! There are any number of "resheader" rows that contain simple ! name/value pairs. ! ! Each data row contains a name, and value. The row also contains a ! type or mimetype. Type corresponds to a .NET class that support ! text/value conversion through the TypeConverter architecture. ! Classes that don't support this are serialized and stored with the ! mimetype set. ! ! The mimetype is used for serialized objects, and tells the ! ResXResourceReader how to depersist the object. This is currently not ! extensible. For a given mimetype the value must be set accordingly: ! ! Note - application/x-microsoft.net.object.binary.base64 is the format ! that the ResXResourceWriter will generate, however the reader can ! read any of the formats listed below. ! ! mimetype: application/x-microsoft.net.object.binary.base64 ! value : The object must be serialized with ! : System.Serialization.Formatters.Binary.BinaryFormatter ! : and then encoded with base64 encoding. ! ! mimetype: application/x-microsoft.net.object.soap.base64 ! value : The object must be serialized with ! : System.Runtime.Serialization.Formatters.Soap.SoapFormatter ! : and then encoded with base64 encoding. ! mimetype: application/x-microsoft.net.object.bytearray.base64 ! value : The object must be serialized into a byte array ! : using a System.ComponentModel.TypeConverter ! : and then encoded with base64 encoding. ! --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:element name="root" msdata:IsDataSet="true"> --- 2,62 ---- <root> <!-- ! Microsoft ResX Schema ! ! Version 1.3 ! ! The primary goals of this format is to allow a simple XML format ! that is mostly human readable. The generation and parsing of the ! various data types are done through the TypeConverter classes ! associated with the data types. ! ! Example: ! ! ... ado.net/XML headers & schema ... ! <resheader name="resmimetype">text/microsoft-resx</resheader> ! <resheader name="version">1.3</resheader> ! <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> ! <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> ! <data name="Name1">this is my long string</data> ! <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> ! <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> ! [base64 mime encoded serialized .NET Framework object] ! </data> ! <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> ! [base64 mime encoded string representing a byte array form of the .NET Framework object] ! </data> ! There are any number of "resheader" rows that contain simple ! name/value pairs. ! ! Each data row contains a name, and value. The row also contains a ! type or mimetype. Type corresponds to a .NET class that support ! text/value conversion through the TypeConverter architecture. ! Classes that don't support this are serialized and stored with the ! mimetype set. ! ! The mimetype is used forserialized objects, and tells the ! ResXResourceReader how to depersist the object. This is currently not ! extensible. For a given mimetype the value must be set accordingly: ! ! Note - application/x-microsoft.net.object.binary.base64 is the format ! that the ResXResourceWriter will generate, however the reader can ! read any of the formats listed below. ! ! mimetype: application/x-microsoft.net.object.binary.base64 ! value : The object must be serialized with ! : System.Serialization.Formatters.Binary.BinaryFormatter ! : and then encoded with base64 encoding. ! ! mimetype: application/x-microsoft.net.object.soap.base64 ! value : The object must be serialized with ! : System.Runtime.Serialization.Formatters.Soap.SoapFormatter ! : and then encoded with base64 encoding. ! ! mimetype: application/x-microsoft.net.object.bytearray.base64 ! value : The object must be serialized into a byte array ! : using a System.ComponentModel.TypeConverter ! : and then encoded with base64 encoding. ! --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:element name="root" msdata:IsDataSet="true"> *************** *** 92,102 **** </resheader> <resheader name="reader"> ! <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> ! <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <data name="$this.Name"> <value>UserControl2</value> </data> </root> \ No newline at end of file --- 93,391 ---- </resheader> <resheader name="reader"> ! <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> ! <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> + <data name="tabControl1.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </data> + <data name="tabControl1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="tabControl1.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </data> + <data name="tabControl1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="tabControl1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="tabControl1.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>8, 8</value> + </data> + <data name="tabPage1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="tabPage1.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </data> + <data name="tabPage1.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </data> + <data name="tabPage1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="tabPage1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="tabPage1.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>8, 8</value> + </data> + <data name="button3.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="button3.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="button3.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="button2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="button2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="button2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="button1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="button1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="button1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="tabPage3.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="tabPage3.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </data> + <data name="tabPage3.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </data> + <data name="tabPage3.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="tabPage3.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="tabPage3.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>8, 8</value> + </data> + <data name="listView1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="listView1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="listView1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="textBox4.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="textBox4.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="textBox4.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="textBox3.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="textBox3.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="textBox3.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="textBox2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="textBox2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="textBox2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="textBox1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="textBox1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="textBox1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="tabPage2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="tabPage2.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </data> + <data name="tabPage2.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </data> + <data name="tabPage2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="tabPage2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="tabPage2.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>8, 8</value> + </data> + <data name="groupBox1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="groupBox1.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>8, 8</value> + </data> + <data name="groupBox1.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </data> + <data name="groupBox1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="groupBox1.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </data> + <data name="groupBox1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="dataGrid1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="dataGrid1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="dataGrid1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="monthCalendar1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="monthCalendar1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="monthCalendar1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="dateTimePicker1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="dateTimePicker1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="dateTimePicker1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="tabPage4.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="tabPage4.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </data> + <data name="tabPage4.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </data> + <data name="tabPage4.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="tabPage4.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="tabPage4.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>8, 8</value> + </data> + <data name="textBox6.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="textBox6.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="textBox6.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="button4.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="button4.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="button4.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="textBox5.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="textBox5.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="textBox5.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="tabPage5.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="tabPage5.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </data> + <data name="tabPage5.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </data> + <data name="tabPage5.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="tabPage5.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="tabPage5.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>8, 8</value> + </data> + <data name="listView2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="listView2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="listView2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </data> <data name="$this.Name"> <value>UserControl2</value> </data> + <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </data> + <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>80</value> + </data> + <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>(Default)</value> + </data> + <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>8, 8</value> + </data> </root> \ No newline at end of file Index: MyFormNode.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest2/MyFormNode.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MyFormNode.cs 5 Dec 2004 15:49:04 -0000 1.8 --- MyFormNode.cs 20 Jan 2005 00:10:50 -0000 1.9 *************** *** 10,14 **** public class MyFormNode : FormNode { ! public MyFormNode(Type controlType,SnapinBase snapin, String displayName, String closedIco, String openIco) : base(snapin, displayName, controlType, closedIco, openIco) { } --- 10,14 ---- public class MyFormNode : FormNode { ! public MyFormNode(Type controlType, SnapinBase snapin, String displayName, String closedIco, String openIco) : base(snapin, displayName, controlType, closedIco, openIco) { } Index: MyReportNode.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest2/MyReportNode.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** MyReportNode.cs 7 Nov 2004 14:45:32 -0000 1.11 --- MyReportNode.cs 20 Jan 2005 00:10:50 -0000 1.12 *************** *** 20,31 **** { this.MultiSelectMode = true; // Alex ! m_items = new ArrayList(); ! m_items.Add(new MyResultViewItem("Poekie", "8", "Cat", this.Snapin, this, "MMCTest2.images.Happy.ico", "MMCTest2.images.Happy.ico")); ! m_items.Add(new MyResultViewItem("Kimmy", "12", "Cat", this.Snapin, this, "MMCTest2.images.Happy.ico", "MMCTest2.images.Happy.ico")); for(int i=0;i<1000;i++) { ! m_items.Add(new MyResultViewItem("Kimmy-" + i , "12", "Cat", this.Snapin, this, "MMCTest2.images.Happy.ico", "MMCTest2.images.Happy.ico")); } --- 20,31 ---- { this.MultiSelectMode = true; // Alex ! Items = new ArrayList(); ! Items.Add(new MyResultViewItem("Poekie", "8", "Cat", this.Snapin, this, "MMCTest2.images.Happy.ico", "MMCTest2.images.Happy.ico")); ! Items.Add(new MyResultViewItem("Kimmy", "12", "Cat", this.Snapin, this, "MMCTest2.images.Happy.ico", "MMCTest2.images.Happy.ico")); for(int i=0;i<1000;i++) { ! Items.Add(new MyResultViewItem("Kimmy-" + i , "12", "Cat", this.Snapin, this, "MMCTest2.images.Happy.ico", "MMCTest2.images.Happy.ico")); } *************** *** 66,76 **** } ! public override ArrayList Items ! { ! get ! { ! return m_items; ! } ! } public override ArrayList Menus --- 66,76 ---- } ! // public override ArrayList Items ! // { ! // get ! // { ! // return m_items; ! // } ! // } public override ArrayList Menus *************** *** 102,106 **** String type = ((WzdAddItem)pages[0]).tbKind.Text; String age = ((WzdAddItem)pages[0]).spinnerAge.Value.ToString(); ! m_items.Add(new MyResultViewItem(name, age, type, this.Snapin, this, "MMCTest2.images.Happy.ico","MMCTest2.images.Happy.ico")); this.RefreshResultConsole(); --- 102,106 ---- String type = ((WzdAddItem)pages[0]).tbKind.Text; String age = ((WzdAddItem)pages[0]).spinnerAge.Value.ToString(); ! Items.Add(new MyResultViewItem(name, age, type, this.Snapin, this, "MMCTest2.images.Happy.ico","MMCTest2.images.Happy.ico")); this.RefreshResultConsole(); Index: MyPropertyPage.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest2/MyPropertyPage.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MyPropertyPage.cs 15 Nov 2004 20:14:38 -0000 1.5 --- MyPropertyPage.cs 20 Jan 2005 00:10:50 -0000 1.6 *************** *** 44,52 **** } ! protected override void InvokeMmcAfterClose() ! { ! m_node.AddChild(new BaseNode(m_snapin, "tryout", "", "")); ! m_node.InsertChildren(); ! } --- 44,52 ---- } ! //protected override void InvokeMmcAfterClose() ! //{ ! // m_node.AddChild(new BaseNode(m_snapin, "tryout", "", "")); ! // m_node.InsertChildren(); ! //} Index: TestSnapinBase.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest2/TestSnapinBase.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TestSnapinBase.cs 7 Nov 2004 14:45:32 -0000 1.8 --- TestSnapinBase.cs 20 Jan 2005 00:10:51 -0000 1.9 *************** *** 2,5 **** --- 2,6 ---- using System.IO; using System.Runtime.InteropServices; + using System.Windows.Forms; using Ironring.MMC.Core; *************** *** 17,21 **** Guid("CC80F65A-54D8-4899-B1AE-892248EEE50D") ] ! public class TestSnapinBase : SnapinBase { public TestSnapinBase() : base() --- 18,22 ---- Guid("CC80F65A-54D8-4899-B1AE-892248EEE50D") ] ! public class TestSnapinBase : SnapinBase, IMessageFilter { public TestSnapinBase() : base() *************** *** 80,83 **** --- 81,112 ---- WizardBase.ShowWizard("Startup Snapin Manager Wizard", new WizardPage[] {new WzdSnapinManager()}, new WizardBase.WizardAction(ManagerHandler)); } + + private void InitializeComponent() + { + // + // TestSnapinBase + // + this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TestSnapinBase_KeyPress); + + } + + private void TestSnapinBase_KeyPress(object sender, System.Windows.Forms.KeyPressEventArgs e) + { + if(e.KeyChar == (char)13) System.Windows.Forms.MessageBox.Show("hoi"); + } + + const int WM_KEYDOWN = 0x100; + const int WM_KEYUP = 0x101; + + public bool PreFilterMessage(ref Message m) + { + Keys keyCode = (Keys)(int)m.WParam & Keys.KeyCode; + if(m.Msg == WM_KEYDOWN && keyCode == Keys.Enter) + { + System.Windows.Forms.MessageBox.Show("hoi dit is een enter"); + return false; + } + return true; + } } } Index: WzdSnapinManager.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest2/WzdSnapinManager.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WzdSnapinManager.cs 31 Mar 2004 07:58:46 -0000 1.3 --- WzdSnapinManager.cs 20 Jan 2005 00:10:51 -0000 1.4 *************** *** 77,90 **** // pictWizLogo // ! this.pictWizLogo.Name = "pictWizLogo"; // // lblExpandedDescription // ! this.lblExpandedDescription.Name = "lblExpandedDescription"; // // lblPageCaption // ! this.lblPageCaption.Name = "lblPageCaption"; ! this.lblPageCaption.Text = "Snapin Manager"; // // radioButton1 --- 77,90 ---- // pictWizLogo // ! this.m_pictWizLogo.Name = "pictWizLogo"; // // lblExpandedDescription // ! this.m_lblExpandedDescription.Name = "lblExpandedDescription"; // // lblPageCaption // ! this.m_lblPageCaption.Name = "lblPageCaption"; ! this.m_lblPageCaption.Text = "Snapin Manager"; // // radioButton1 Index: UserControl2.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest2/UserControl2.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** UserControl2.cs 31 Mar 2004 07:58:46 -0000 1.3 --- UserControl2.cs 20 Jan 2005 00:10:51 -0000 1.4 *************** *** 6,9 **** --- 6,12 ---- using System.Windows.Forms; + using Ironring.MMC.Nodes; + using Ironring.MMC.Core; + namespace MMCTest2 { *************** *** 11,15 **** /// Summary description for UserControl2. /// </summary> ! public class UserControl2 : System.Windows.Forms.UserControl { private System.Windows.Forms.TabControl tabControl1; --- 14,18 ---- /// Summary description for UserControl2. /// </summary> ! public class UserControl2 : System.Windows.Forms.UserControl, ISnapinLink { private System.Windows.Forms.TabControl tabControl1; *************** *** 29,32 **** --- 32,41 ---- private System.Windows.Forms.TextBox textBox4; private System.Windows.Forms.ListView listView1; + private System.Windows.Forms.TabPage tabPage4; + private System.Windows.Forms.TextBox textBox5; + private System.Windows.Forms.TabPage tabPage5; + private System.Windows.Forms.ListView listView2; + private System.Windows.Forms.Button button4; + private System.Windows.Forms.TextBox textBox6; /// <summary> /// Required designer variable. *************** *** 38,46 **** // This call is required by the Windows.Forms Form Designer. InitializeComponent(); - // TODO: Add any initialization after the InitForm call } /// <summary> /// Clean up any resources being used. --- 47,61 ---- // This call is required by the Windows.Forms Form Designer. InitializeComponent(); // TODO: Add any initialization after the InitForm call } + protected BaseNode m_contextnode; + public BaseNode ContextNode + { + get{return m_contextnode;} + set{m_contextnode = value;} + } + /// <summary> /// Clean up any resources being used. *************** *** 65,267 **** private void InitializeComponent() { ! this.tabControl1 = new System.Windows.Forms.TabControl(); ! this.tabPage1 = new System.Windows.Forms.TabPage(); ! this.button3 = new System.Windows.Forms.Button(); ! this.button2 = new System.Windows.Forms.Button(); ! this.button1 = new System.Windows.Forms.Button(); ! this.tabPage2 = new System.Windows.Forms.TabPage(); ! this.groupBox1 = new System.Windows.Forms.GroupBox(); ! this.dataGrid1 = new System.Windows.Forms.DataGrid(); ! this.monthCalendar1 = new System.Windows.Forms.MonthCalendar(); ! this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); ! this.tabPage3 = new System.Windows.Forms.TabPage(); ! this.listView1 = new System.Windows.Forms.ListView(); ! this.textBox4 = new System.Windows.Forms.TextBox(); ! this.textBox3 = new System.Windows.Forms.TextBox(); ! this.textBox2 = new System.Windows.Forms.TextBox(); ! this.textBox1 = new System.Windows.Forms.TextBox(); ! this.tabControl1.SuspendLayout(); ! this.tabPage1.SuspendLayout(); ! this.tabPage2.SuspendLayout(); ! this.groupBox1.SuspendLayout(); ! ((System.ComponentModel.ISupportInitialize)(this.dataGrid1)).BeginInit(); ! this.tabPage3.SuspendLayout(); ! this.SuspendLayout(); ! // ! // tabControl1 ! // ! this.tabControl1.Anchor = (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) ! | System.Windows.Forms.AnchorStyles.Left) ! | System.Windows.Forms.AnchorStyles.Right); ! this.tabControl1.Controls.AddRange(new System.Windows.Forms.Control[] { ! this.tabPage1, ! this.tabPage2, ! this.tabPage3}); ! this.tabControl1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0))); ! this.tabControl1.Location = new System.Drawing.Point(8, 8); ! this.tabControl1.Name = "tabControl1"; ! this.tabControl1.SelectedIndex = 0; ! this.tabControl1.Size = new System.Drawing.Size(406, 304); ! this.tabControl1.TabIndex = 0; ! this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); ! // ! // tabPage1 ! // ! this.tabPage1.Controls.AddRange(new System.Windows.Forms.Control[] { ! this.button3, ! this.button2, ! this.button1}); ! this.tabPage1.Location = new System.Drawing.Point(4, 22); ! this.tabPage1.Name = "tabPage1"; ! this.tabPage1.Size = new System.Drawing.Size(398, 278); ! this.tabPage1.TabIndex = 0; ! this.tabPage1.Text = "tabPage1"; ! // ! // button3 ! // ! this.button3.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right); ! this.button3.Location = new System.Drawing.Point(296, 216); ! this.button3.Name = "button3"; ! this.button3.Size = new System.Drawing.Size(88, 48); ! this.button3.TabIndex = 2; ! this.button3.Text = "button3"; ! // ! // button2 ! // ! this.button2.Anchor = System.Windows.Forms.AnchorStyles.None; ! this.button2.Location = new System.Drawing.Point(152, 112); ! this.button2.Name = "button2"; ! this.button2.Size = new System.Drawing.Size(88, 48); ! this.button2.TabIndex = 1; ! this.button2.Text = "button2"; ! // ! // button1 ! // ! this.button1.Location = new System.Drawing.Point(16, 16); ! this.button1.Name = "button1"; ! this.button1.Size = new System.Drawing.Size(88, 48); ! this.button1.TabIndex = 0; ! this.button1.Text = "button1"; ! // ! // tabPage2 ! // ! this.tabPage2.Controls.AddRange(new System.Windows.Forms.Control[] { ! this.groupBox1}); ! this.tabPage2.Location = new System.Drawing.Point(4, 22); ! this.tabPage2.Name = "tabPage2"; ! this.tabPage2.Size = new System.Drawing.Size(398, 278); ! this.tabPage2.TabIndex = 1; ! this.tabPage2.Text = "tabPage2"; ! // ! // groupBox1 ! // ! this.groupBox1.Controls.AddRange(new System.Windows.Forms.Control[] { ! this.dataGrid1, ! this.monthCalendar1, ! this.dateTimePicker1}); ! this.groupBox1.Location = new System.Drawing.Point(8, 8); ! this.groupBox1.Name = "groupBox1"; ! this.groupBox1.Size = new System.Drawing.Size(384, 256); ! this.groupBox1.TabIndex = 0; ! this.groupBox1.TabStop = false; ! this.groupBox1.Text = "groupBox1"; ! // ! // dataGrid1 ! // ! this.dataGrid1.DataMember = ""; ! this.dataGrid1.HeaderForeColor = System.Drawing.SystemColors.ControlText; ! this.dataGrid1.Location = new System.Drawing.Point(240, 24); ! this.dataGrid1.Name = "dataGrid1"; ! this.dataGrid1.Size = new System.Drawing.Size(128, 216); ! this.dataGrid1.TabIndex = 2; ! // ! // monthCalendar1 ! // ! this.monthCalendar1.Location = new System.Drawing.Point(16, 88); ! this.monthCalendar1.Name = "monthCalendar1"; ! this.monthCalendar1.TabIndex = 1; ! // ! // dateTimePicker1 ! // ! this.dateTimePicker1.Location = new System.Drawing.Point(16, 48); ! this.dateTimePicker1.Name = "dateTimePicker1"; ! this.dateTimePicker1.Size = new System.Drawing.Size(208, 20); ! this.dateTimePicker1.TabIndex = 0; ! // ! // tabPage3 ! // ! this.tabPage3.Controls.AddRange(new System.Windows.Forms.Control[] { ! this.listView1, ! this.textBox4, ! this.textBox3, ! this.textBox2, ! this.textBox1}); ! this.tabPage3.Location = new System.Drawing.Point(4, 22); ! this.tabPage3.Name = "tabPage3"; ! this.tabPage3.Size = new System.Drawing.Size(398, 278); ! this.tabPage3.TabIndex = 2; ! this.tabPage3.Text = "tabPage3"; ! // ! // listView1 ! // ! this.listView1.Location = new System.Drawing.Point(200, 16); ! this.listView1.Name = "listView1"; ! this.listView1.Size = new System.Drawing.Size(184, 248); ! this.listView1.TabIndex = 4; ! // ! // textBox4 ! // ! this.textBox4.Location = new System.Drawing.Point(16, 112); ! this.textBox4.Name = "textBox4"; ! this.textBox4.Size = new System.Drawing.Size(168, 20); ! this.textBox4.TabIndex = 3; ! this.textBox4.Text = "textBox4"; ! // ! // textBox3 ! // ! this.textBox3.Location = new System.Drawing.Point(16, 80); ! this.textBox3.Name = "textBox3"; ! this.textBox3.Size = new System.Drawing.Size(168, 20); ! this.textBox3.TabIndex = 2; ! this.textBox3.Text = "textBox3"; ! // ! // textBox2 ! // ! this.textBox2.Location = new System.Drawing.Point(16, 48); ! this.textBox2.Name = "textBox2"; ! this.textBox2.Size = new System.Drawing.Size(168, 20); ! this.textBox2.TabIndex = 1; ! this.textBox2.Text = "textBox2"; ! // ! // textBox1 ! // ! this.textBox1.Location = new System.Drawing.Point(16, 16); ! this.textBox1.Name = "textBox1"; ! this.textBox1.Size = new System.Drawing.Size(168, 20); ! this.textBox1.TabIndex = 0; ! this.textBox1.Text = "textBox1"; ! // ! // UserControl2 ! // ! this.Controls.AddRange(new System.Windows.Forms.Control[] { ! this.tabControl1}); ! this.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0))); ! this.Name = "UserControl2"; ! this.Size = new System.Drawing.Size(424, 328); ! this.tabControl1.ResumeLayout(false); ! this.tabPage1.ResumeLayout(false); ! this.tabPage2.ResumeLayout(false); ! this.groupBox1.ResumeLayout(false); ! ((System.ComponentModel.ISupportInitialize)(this.dataGrid1)).EndInit(); ! this.tabPage3.ResumeLayout(false); ! this.ResumeLayout(false); ! } #endregion - private void tabControl1_SelectedIndexChanged(object sender, System.EventArgs e) - { - - } } } --- 80,351 ---- private void InitializeComponent() { ! System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem("0"); ! System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem("1"); ! System.Windows.Forms.ListViewItem listViewItem3 = new System.Windows.Forms.ListViewItem("2"); ! System.Windows.Forms.ListViewItem listViewItem4 = new System.Windows.Forms.ListViewItem("3"); ! System.Windows.Forms.ListViewItem listViewItem5 = new System.Windows.Forms.ListViewItem("4"); ! System.Windows.Forms.ListViewItem listViewItem6 = new System.Windows.Forms.ListViewItem("5"); ! System.Windows.Forms.ListViewItem listViewItem7 = new System.Windows.Forms.ListViewItem("6"); ! this.tabControl1 = new System.Windows.Forms.TabControl(); ! this.tabPage1 = new System.Windows.Forms.TabPage(); ! this.button3 = new System.Windows.Forms.Button(); ! this.button2 = new System.Windows.Forms.Button(); ! this.button1 = new System.Windows.Forms.Button(); ! this.tabPage3 = new System.Windows.Forms.TabPage(); ! this.listView1 = new System.Windows.Forms.ListView(); ! this.textBox4 = new System.Windows.Forms.TextBox(); ! this.textBox3 = new System.Windows.Forms.TextBox(); ! this.textBox2 = new System.Windows.Forms.TextBox(); ! this.textBox1 = new System.Windows.Forms.TextBox(); ! this.tabPage2 = new System.Windows.Forms.TabPage(); ! this.groupBox1 = new System.Windows.Forms.GroupBox(); ! this.dataGrid1 = new System.Windows.Forms.DataGrid(); ! this.monthCalendar1 = new System.Windows.Forms.MonthCalendar(); ! this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); ! this.tabPage4 = new System.Windows.Forms.TabPage(); ! this.textBox6 = new System.Windows.Forms.TextBox(); ! this.button4 = new System.Windows.Forms.Button(); ! this.textBox5 = new System.Windows.Forms.TextBox(); ! this.tabPage5 = new System.Windows.Forms.TabPage(); ! this.listView2 = new System.Windows.Forms.ListView(); ! this.tabControl1.SuspendLayout(); ! this.tabPage1.SuspendLayout(); ! this.tabPage3.SuspendLayout(); ! this.tabPage2.SuspendLayout(); ! this.groupBox1.SuspendLayout(); ! ((System.ComponentModel.ISupportInitialize)(this.dataGrid1)).BeginInit(); ! this.tabPage4.SuspendLayout(); ! this.tabPage5.SuspendLayout(); ! this.SuspendLayout(); ! // ! // tabControl1 ! // ! this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) ! | System.Windows.Forms.AnchorStyles.Left) ! | System.Windows.Forms.AnchorStyles.Right))); ! this.tabControl1.Controls.Add(this.tabPage1); ! this.tabControl1.Controls.Add(this.tabPage3); ! this.tabControl1.Controls.Add(this.tabPage2); ! this.tabControl1.Controls.Add(this.tabPage4); ! this.tabControl1.Controls.Add(this.tabPage5); ! this.tabControl1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0))); ! this.tabControl1.Location = new System.Drawing.Point(8, 8); ! this.tabControl1.Name = "tabControl1"; ! this.tabControl1.SelectedIndex = 0; ! this.tabControl1.Size = new System.Drawing.Size(406, 304); ! this.tabControl1.TabIndex = 0; ! // ! // tabPage1 ! // ! this.tabPage1.Controls.Add(this.button3); ! this.tabPage1.Controls.Add(this.button2); ! this.tabPage1.Controls.Add(this.button1); ! this.tabPage1.Location = new System.Drawing.Point(4, 22); ! this.tabPage1.Name = "tabPage1"; ! this.tabPage1.Size = new System.Drawing.Size(398, 278); ! this.tabPage1.TabIndex = 0; ! this.tabPage1.Text = "tabPage1"; ! // ! // button3 ! // ! this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); ! this.button3.Location = new System.Drawing.Point(296, 216); ! this.button3.Name = "button3"; ! this.button3.Size = new System.Drawing.Size(88, 48); ! this.button3.TabIndex = 2; ! this.button3.Text = "button3"; ! // ! // button2 ! // ! this.button2.Anchor = System.Windows.Forms.AnchorStyles.None; ! this.button2.Location = new System.Drawing.Point(152, 112); ! this.button2.Name = "button2"; ! this.button2.Size = new System.Drawing.Size(88, 48); ! this.button2.TabIndex = 1; ! this.button2.Text = "button2"; ! // ! // button1 ! // ! this.button1.Location = new System.Drawing.Point(16, 16); ! this.button1.Name = "button1"; ! this.button1.Size = new System.Drawing.Size(88, 48); ! this.button1.TabIndex = 0; ! this.button1.Text = "button1"; ! // ! // tabPage3 ! // ! this.tabPage3.Controls.Add(this.listView1); ! this.tabPage3.Controls.Add(this.textBox4); ! this.tabPage3.Controls.Add(this.textBox3); ! this.tabPage3.Controls.Add(this.textBox2); ! this.tabPage3.Controls.Add(this.textBox1); ! this.tabPage3.Location = new System.Drawing.Point(4, 22); ! this.tabPage3.Name = "tabPage3"; ! this.tabPage3.Size = new System.Drawing.Size(398, 278); ! this.tabPage3.TabIndex = 2; ! this.tabPage3.Text = "tabPage3"; ! // ! // listView1 ! // ! this.listView1.Location = new System.Drawing.Point(200, 16); ! this.listView1.Name = "listView1"; ! this.listView1.Size = new System.Drawing.Size(184, 248); ! this.listView1.TabIndex = 4; ! // ! // textBox4 ! // ! this.textBox4.Location = new System.Drawing.Point(16, 112); ! this.textBox4.Name = "textBox4"; ! this.textBox4.Size = new System.Drawing.Size(168, 20); ! this.textBox4.TabIndex = 3; ! this.textBox4.Text = "textBox4"; ! // ! // textBox3 ! // ! this.textBox3.Location = new System.Drawing.Point(16, 80); ! this.textBox3.Name = "textBox3"; ! this.textBox3.Size = new System.Drawing.Size(168, 20); ! this.textBox3.TabIndex = 4; ! this.textBox3.Text = "textBox3"; ! // ! // textBox2 ! // ! this.textBox2.Location = new System.Drawing.Point(16, 48); ! this.textBox2.Name = "textBox2"; ! this.textBox2.Size = new System.Drawing.Size(168, 20); ! this.textBox2.TabIndex = 1; ! this.textBox2.Text = "textBox2"; ! // ! // textBox1 ! // ! this.textBox1.Location = new System.Drawing.Point(16, 16); ! this.textBox1.Name = "textBox1"; ! this.textBox1.Size = new System.Drawing.Size(168, 20); ! this.textBox1.TabIndex = 5; ! this.textBox1.Text = "textBox1"; ! // ! // tabPage2 ! // ! this.tabPage2.Controls.Add(this.groupBox1); ! this.tabPage2.Location = new System.Drawing.Point(4, 22); ! this.tabPage2.Name = "tabPage2"; ! this.tabPage2.Size = new System.Drawing.Size(398, 278); ! this.tabPage2.TabIndex = 1; ! this.tabPage2.Text = "tabPage2"; ! // ! // groupBox1 ! // ! this.groupBox1.Controls.Add(this.dataGrid1); ! this.groupBox1.Controls.Add(this.monthCalendar1); ! this.groupBox1.Controls.Add(this.dateTimePicker1); ! this.groupBox1.Location = new System.Drawing.Point(8, 8); ! this.groupBox1.Name = "groupBox1"; ! this.groupBox1.Size = new System.Drawing.Size(384, 256); ! this.groupBox1.TabIndex = 0; ! this.groupBox1.TabStop = false; ! this.groupBox1.Text = "groupBox1"; ! // ! // dataGrid1 ! // ! this.dataGrid1.DataMember = ""; ! this.dataGrid1.HeaderForeColor = System.Drawing.SystemColors.ControlText; ! this.dataGrid1.Location = new System.Drawing.Point(240, 24); ! this.dataGrid1.Name = "dataGrid1"; ! this.dataGrid1.Size = new System.Drawing.Size(128, 216); ! this.dataGrid1.TabIndex = 2; ! // ! // monthCalendar1 ! // ! this.monthCalendar1.Location = new System.Drawing.Point(16, 88); ! this.monthCalendar1.Name = "monthCalendar1"; ! this.monthCalendar1.TabIndex = 1; ! // ! // dateTimePicker1 ! // ! this.dateTimePicker1.Location = new System.Drawing.Point(16, 48); ! this.dateTimePicker1.Name = "dateTimePicker1"; ! this.dateTimePicker1.Size = new System.Drawing.Size(208, 20); ! this.dateTimePicker1.TabIndex = 0; ! // ! // tabPage4 ! // ! this.tabPage4.Controls.Add(this.textBox6); ! this.tabPage4.Controls.Add(this.button4); ! this.tabPage4.Controls.Add(this.textBox5); ! this.tabPage4.Location = new System.Drawing.Point(4, 22); ! this.tabPage4.Name = "tabPage4"; ! this.tabPage4.Size = new System.Drawing.Size(398, 278); ! this.tabPage4.TabIndex = 3; ! this.tabPage4.Text = "tabPage4"; ! // ! // textBox6 ! // ! this.textBox6.Location = new System.Drawing.Point(8, 240); ! this.textBox6.Name = "textBox6"; ! this.textBox6.Size = new System.Drawing.Size(272, 20); ! this.textBox6.TabIndex = 2; ! this.textBox6.Text = "test"; ! // ! // button4 ! // ! this.button4.Location = new System.Drawing.Point(296, 240); ! this.button4.Name = "button4"; ! this.button4.Size = new System.Drawing.Size(88, 24); ! this.button4.TabIndex = 1; ! this.button4.Text = "test"; ! // ! // textBox5 ! // ! this.textBox5.AcceptsReturn = true; ! this.textBox5.Location = new System.Drawing.Point(8, 16); ! this.textBox5.Multiline = true; ! this.textBox5.Name = "textBox5"; ! this.textBox5.Size = new System.Drawing.Size(376, 208); ! this.textBox5.TabIndex = 0; ! this.textBox5.Text = "test for enters"; ! // ! // tabPage5 ! // ! this.tabPage5.Controls.Add(this.listView2); ! this.tabPage5.Location = new System.Drawing.Point(4, 22); ! this.tabPage5.Name = "tabPage5"; ! this.tabPage5.Size = new System.Drawing.Size(398, 278); ! this.tabPage5.TabIndex = 4; ! this.tabPage5.Text = "tabPage5"; ! // ! // listView2 ! // ! this.listView2.Items.AddRange(new System.Windows.Forms.ListViewItem[] { ! listViewItem1, ! listViewItem2, ! listViewItem3, ! listViewItem4, ! listViewItem5, ! listViewItem6, ! listViewItem7}); ! this.listView2.Location = new System.Drawing.Point(8, 16); ! this.listView2.Name = "listView2"; ! this.listView2.Size = new System.Drawing.Size(376, 248); ! this.listView2.TabIndex = 0; ! // ! // UserControl2 ! // ! this.Controls.Add(this.tabControl1); ! this.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0))); ! this.Name = "UserControl2"; ! this.Size = new System.Drawing.Size(424, 328); ! this.tabControl1.ResumeLayout(false); ! this.tabPage1.ResumeLayout(false); ! this.tabPage3.ResumeLayout(false); ! this.tabPage2.ResumeLayout(false); ! this.groupBox1.ResumeLayout(false); ! ((System.ComponentModel.ISupportInitialize)(this.dataGrid1)).EndInit(); ! this.tabPage4.ResumeLayout(false); ! this.tabPage5.ResumeLayout(false); ! this.ResumeLayout(false); ! } #endregion } } Index: MMCTest2.csproj =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCTest2/MMCTest2.csproj,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MMCTest2.csproj 15 Nov 2004 19:47:24 -0000 1.10 --- MMCTest2.csproj 20 Jan 2005 00:10:50 -0000 1.11 *************** *** 180,183 **** --- 180,188 ---- /> <File + RelPath = "TestSnapinBase.resx" + DependentUpon = "TestSnapinBase.cs" + BuildAction = "EmbeddedResource" + /> + <File RelPath = "UserControl1.cs" SubType = "UserControl" *************** *** 201,205 **** <File RelPath = "WzdAddItem.cs" ! SubType = "Code" BuildAction = "Compile" /> --- 206,210 ---- <File RelPath = "WzdAddItem.cs" ! SubType = "UserControl" BuildAction = "Compile" /> *************** *** 211,215 **** <File RelPath = "WzdSnapinManager.cs" ! SubType = "Code" BuildAction = "Compile" /> --- 216,220 ---- <File RelPath = "WzdSnapinManager.cs" ! SubType = "UserControl" BuildAction = "Compile" /> |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-19 23:56:16
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/Wizards In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17108 Modified Files: WizardBase.cs WizardBase.resx WizardPage.cs WizardPage.resx Log Message: Added i18n support Changed a lot of protected variables that where storage for properties to private Index: WizardPage.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Wizards/WizardPage.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WizardPage.cs 31 Mar 2004 07:58:46 -0000 1.1 --- WizardPage.cs 19 Jan 2005 23:56:04 -0000 1.2 *************** *** 14,21 **** public class WizardPage : System.Windows.Forms.UserControl { - private Panel pnlHeader; - public PictureBox pictWizLogo; - protected Label lblExpandedDescription; - protected Label lblPageCaption; private Container components = null; --- 14,17 ---- *************** *** 26,32 **** public delegate void WizardPageChanged(WizardPage me); ! protected ArrayList listeners = new ArrayList(); ! protected WizardBase wizardBase; ! protected BaseNode node; /// <summary> --- 22,32 ---- public delegate void WizardPageChanged(WizardPage me); ! protected ArrayList m_listeners = new ArrayList(); ! private WizardBase _wizardBase; ! private System.Windows.Forms.Panel _pnlHeader; ! protected System.Windows.Forms.PictureBox m_pictWizLogo; ! protected System.Windows.Forms.Label m_lblExpandedDescription; ! protected System.Windows.Forms.Label m_lblPageCaption; ! protected BaseNode m_node; /// <summary> *************** *** 43,49 **** /// </summary> /// <param name="Node">The node where we belong to</param> ! public WizardPage(BaseNode Node) { ! this.node = Node; InitializeComponent(); } --- 43,49 ---- /// </summary> /// <param name="Node">The node where we belong to</param> ! public WizardPage(BaseNode node) { ! m_node = node; InitializeComponent(); } *************** *** 54,67 **** public BaseNode Node { ! get{ return this.node; } } /// <summary> ! /// Get the wizard where we belong to /// </summary> public WizardBase WizardBase { ! get { return wizardBase; } ! set { wizardBase = value; } } --- 54,67 ---- public BaseNode Node { ! get{ return m_node; } } /// <summary> ! /// Get or set the wizard where we belong to /// </summary> public WizardBase WizardBase { ! get { return _wizardBase; } ! set { _wizardBase = value; } } *************** *** 82,86 **** public void Add_WizardPageStateChange(WizardPageChanged listener) { ! this.listeners.Add(listener); } --- 82,86 ---- public void Add_WizardPageStateChange(WizardPageChanged listener) { ! this.m_listeners.Add(listener); } *************** *** 91,95 **** public void Remove_WizardPageStateChange(WizardPageChanged listener) { ! this.listeners.Remove(listener); } --- 91,95 ---- public void Remove_WizardPageStateChange(WizardPageChanged listener) { ! this.m_listeners.Remove(listener); } *************** *** 99,103 **** public void FirePageChange() { ! object[] list = this.listeners.ToArray(); for(int i=0, max=list.Length; i<max; i++) Invoke((WizardPageChanged)list[i], new object[] { this }); --- 99,103 ---- public void FirePageChange() { ! object[] list = this.m_listeners.ToArray(); for(int i=0, max=list.Length; i<max; i++) Invoke((WizardPageChanged)list[i], new object[] { this }); *************** *** 134,186 **** private void InitializeComponent() { ! this.pnlHeader = new System.Windows.Forms.Panel(); ! this.pictWizLogo = new System.Windows.Forms.PictureBox(); ! this.lblExpandedDescription = new System.Windows.Forms.Label(); ! this.lblPageCaption = new System.Windows.Forms.Label(); ! this.pnlHeader.SuspendLayout(); this.SuspendLayout(); // ! // pnlHeader // ! this.pnlHeader.BackColor = System.Drawing.SystemColors.Window; ! this.pnlHeader.Controls.Add(this.pictWizLogo); ! this.pnlHeader.Controls.Add(this.lblExpandedDescription); ! this.pnlHeader.Controls.Add(this.lblPageCaption); ! this.pnlHeader.Location = new System.Drawing.Point(0, 0); ! this.pnlHeader.Name = "pnlHeader"; ! this.pnlHeader.Size = new System.Drawing.Size(496, 64); ! this.pnlHeader.TabIndex = 1; // ! // pictWizLogo // ! this.pictWizLogo.Location = new System.Drawing.Point(440, 8); ! this.pictWizLogo.Name = "pictWizLogo"; ! this.pictWizLogo.Size = new System.Drawing.Size(48, 48); ! this.pictWizLogo.TabIndex = 2; ! this.pictWizLogo.TabStop = false; // ! // lblExpandedDescription // ! this.lblExpandedDescription.Location = new System.Drawing.Point(48, 32); ! this.lblExpandedDescription.Name = "lblExpandedDescription"; ! this.lblExpandedDescription.Size = new System.Drawing.Size(320, 24); ! this.lblExpandedDescription.TabIndex = 1; ! this.lblExpandedDescription.Text = "Wizard page explanation"; // ! // lblPageCaption // ! this.lblPageCaption.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0))); ! this.lblPageCaption.Location = new System.Drawing.Point(16, 16); ! this.lblPageCaption.Name = "lblPageCaption"; ! this.lblPageCaption.Size = new System.Drawing.Size(352, 16); ! this.lblPageCaption.TabIndex = 0; ! this.lblPageCaption.Text = "Wizard page caption"; // // WizardPage // ! this.Controls.Add(this.pnlHeader); this.Name = "WizardPage"; this.Size = new System.Drawing.Size(496, 328); ! this.pnlHeader.ResumeLayout(false); this.ResumeLayout(false); --- 134,186 ---- private void InitializeComponent() { ! this._pnlHeader = new System.Windows.Forms.Panel(); ! this.m_pictWizLogo = new System.Windows.Forms.PictureBox(); ! this.m_lblExpandedDescription = new System.Windows.Forms.Label(); ! this.m_lblPageCaption = new System.Windows.Forms.Label(); ! this._pnlHeader.SuspendLayout(); this.SuspendLayout(); // ! // _pnlHeader // ! this._pnlHeader.BackColor = System.Drawing.SystemColors.Window; ! this._pnlHeader.Controls.Add(this.m_pictWizLogo); ! this._pnlHeader.Controls.Add(this.m_lblExpandedDescription); ! this._pnlHeader.Controls.Add(this.m_lblPageCaption); ! this._pnlHeader.Location = new System.Drawing.Point(0, 0); ! this._pnlHeader.Name = "_pnlHeader"; ! this._pnlHeader.Size = new System.Drawing.Size(496, 64); ! this._pnlHeader.TabIndex = 1; // ! // m_pictWizLogo // ! this.m_pictWizLogo.Location = new System.Drawing.Point(440, 8); ! this.m_pictWizLogo.Name = "m_pictWizLogo"; ! this.m_pictWizLogo.Size = new System.Drawing.Size(48, 48); ! this.m_pictWizLogo.TabIndex = 2; ! this.m_pictWizLogo.TabStop = false; // ! // m_lblExpandedDescription // ! this.m_lblExpandedDescription.Location = new System.Drawing.Point(48, 32); ! this.m_lblExpandedDescription.Name = "m_lblExpandedDescription"; ! this.m_lblExpandedDescription.Size = new System.Drawing.Size(320, 24); ! this.m_lblExpandedDescription.TabIndex = 1; ! this.m_lblExpandedDescription.Text = "Wizard page explanation"; // ! // m_lblPageCaption // ! this.m_lblPageCaption.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0))); ! this.m_lblPageCaption.Location = new System.Drawing.Point(16, 16); ! this.m_lblPageCaption.Name = "m_lblPageCaption"; ! this.m_lblPageCaption.Size = new System.Drawing.Size(352, 16); ! this.m_lblPageCaption.TabIndex = 0; ! this.m_lblPageCaption.Text = "Wizard page caption"; // // WizardPage // ! this.Controls.Add(this._pnlHeader); this.Name = "WizardPage"; this.Size = new System.Drawing.Size(496, 328); ! this._pnlHeader.ResumeLayout(false); this.ResumeLayout(false); Index: WizardBase.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Wizards/WizardBase.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** WizardBase.cs 19 Oct 2004 20:51:17 -0000 1.5 --- WizardBase.cs 19 Jan 2005 23:56:04 -0000 1.6 *************** *** 7,10 **** --- 7,12 ---- using System.Threading; + using Ironring.MMC.Core; + namespace Ironring.MMC.Wizards { *************** *** 15,26 **** */ private Container components = null; - protected TabControl tabWizardPages; - private Button btnCancel; - private Button btnNext; - private Button btnBack; protected ArrayList pages = new ArrayList(); ! protected DialogResult m_CachedDialogResult = DialogResult.None; /// <summary> --- 17,28 ---- */ private Container components = null; protected ArrayList pages = new ArrayList(); + private System.Windows.Forms.Button _btnCancel; + private System.Windows.Forms.Button _btnNext; + private System.Windows.Forms.Button _btnBack; + protected System.Windows.Forms.TabControl m_tabWizardPages; ! private DialogResult _cachedDialogResult = DialogResult.None; /// <summary> *************** *** 79,84 **** public DialogResult CachedDialogResult { ! set{m_CachedDialogResult = value; } ! get{return m_CachedDialogResult; } } --- 81,86 ---- public DialogResult CachedDialogResult { ! set{_cachedDialogResult = value; } ! get{return _cachedDialogResult; } } *************** *** 88,93 **** public int SelectedPage { ! set{this.tabWizardPages.SelectedIndex = value;} ! get{return this.tabWizardPages.SelectedIndex;} } --- 90,95 ---- public int SelectedPage { ! set{m_tabWizardPages.SelectedIndex = value;} ! get{return m_tabWizardPages.SelectedIndex;} } *************** *** 161,169 **** if(wp.WizardPageValid) { ! btnNext.Enabled = true; } else { ! btnNext.Enabled = false; } } --- 163,171 ---- if(wp.WizardPageValid) { ! _btnNext.Enabled = true; } else { ! _btnNext.Enabled = false; } } *************** *** 179,184 **** public virtual void InitPages() { ! this.tabWizardPages.SuspendLayout(); ! this.tabWizardPages.Controls.Clear(); int count = 0; IEnumerator i=this.pages.GetEnumerator(); --- 181,186 ---- public virtual void InitPages() { ! m_tabWizardPages.SuspendLayout(); ! m_tabWizardPages.Controls.Clear(); int count = 0; IEnumerator i=this.pages.GetEnumerator(); *************** *** 190,196 **** tb.Controls.Add(wp); ! this.tabWizardPages.Controls.Add(tb); } ! this.tabWizardPages.ResumeLayout(true); InitButtons(); } --- 192,198 ---- tb.Controls.Add(wp); ! m_tabWizardPages.Controls.Add(tb); } ! m_tabWizardPages.ResumeLayout(true); InitButtons(); } *************** *** 203,226 **** try { ! if( tabWizardPages.SelectedIndex == (tabWizardPages.TabCount - 1) ) ! { ! btnNext.Text = "&Finish"; ! } else ! { ! btnNext.Text = "&Next >"; ! } ! ! if( tabWizardPages.SelectedIndex == 0 ) ! { ! btnBack.Enabled = false; ! } else ! { ! btnBack.Enabled = true; ! } // Get the current page and check it ! WizardPage wp = (WizardPage)tabWizardPages.SelectedTab.Controls[0]; CheckWizardStatus(wp); } --- 205,220 ---- try { ! if( m_tabWizardPages.SelectedIndex == (m_tabWizardPages.TabCount - 1) ) ! _btnNext.Text = SnapinBase.Translate("FinishWizButton"); else ! _btnNext.Text = SnapinBase.Translate("NextWizButton"); ! ! if( m_tabWizardPages.SelectedIndex == 0 ) ! _btnBack.Enabled = false; else ! _btnBack.Enabled = true; // Get the current page and check it ! WizardPage wp = (WizardPage)m_tabWizardPages.SelectedTab.Controls[0]; CheckWizardStatus(wp); } *************** *** 259,315 **** private void InitializeComponent() { ! this.tabWizardPages = new TabControl(); ! this.btnCancel = new Button(); ! this.btnNext = new Button(); ! this.btnBack = new Button(); this.SuspendLayout(); // ! // tabWizardPages // ! this.tabWizardPages.Location =new System.Drawing.Point(-1, -23); ! this.tabWizardPages.Name = "tabWizardPages"; ! this.tabWizardPages.SelectedIndex = 0; ! this.tabWizardPages.Size = new System.Drawing.Size(499, 367); ! this.tabWizardPages.TabIndex = 0; // ! // btnCancel // ! this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; ! this.btnCancel.Location = new System.Drawing.Point(408, 352); ! this.btnCancel.Name = "btnCancel"; ! this.btnCancel.Size = new System.Drawing.Size(80, 24); ! this.btnCancel.TabIndex = 1; ! this.btnCancel.Text = "&Cancel"; ! this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); // ! // btnNext // ! this.btnNext.Location = new System.Drawing.Point(320, 352); ! this.btnNext.Name = "btnNext"; ! this.btnNext.Size = new System.Drawing.Size(80, 24); ! this.btnNext.TabIndex = 2; ! this.btnNext.Text = "&Next >"; ! this.btnNext.Click += new System.EventHandler(this.btnNext_Click) ; // ! // btnBack // ! this.btnBack.Location = new System.Drawing.Point(240, 352); ! this.btnBack.Name = "btnBack"; ! this.btnBack.Size = new System.Drawing.Size(80, 24); ! this.btnBack.TabIndex = 3; ! this.btnBack.Text = "< &Back"; ! this.btnBack.Click += new System.EventHandler(this.btnBack_Click); // // WizardBase // ! this.AcceptButton = this.btnNext; this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); ! this.CancelButton = this.btnCancel; ! this.ClientSize = new System.Drawing.Size(496, 381); ! this.Controls.Add(this.btnBack); ! this.Controls.Add(this.btnNext); ! this.Controls.Add(this.btnCancel); ! this.Controls.Add(this.tabWizardPages); ! this.FormBorderStyle = FormBorderStyle.FixedDialog; this.MaximizeBox = false; this.MinimizeBox = false; --- 253,308 ---- private void InitializeComponent() { ! this.m_tabWizardPages = new System.Windows.Forms.TabControl(); ! this._btnCancel = new System.Windows.Forms.Button(); ! this._btnNext = new System.Windows.Forms.Button(); ! this._btnBack = new System.Windows.Forms.Button(); this.SuspendLayout(); // ! // m_tabWizardPages // ! this.m_tabWizardPages.Location = new System.Drawing.Point(-1, -23); ! this.m_tabWizardPages.Name = "m_tabWizardPages"; ! this.m_tabWizardPages.SelectedIndex = 0; ! this.m_tabWizardPages.Size = new System.Drawing.Size(499, 367); ! this.m_tabWizardPages.TabIndex = 0; // ! // _btnCancel // ! this._btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; ! this._btnCancel.Location = new System.Drawing.Point(408, 352); ! this._btnCancel.Name = "_btnCancel"; ! this._btnCancel.Size = new System.Drawing.Size(80, 24); ! this._btnCancel.TabIndex = 1; ! this._btnCancel.Text = SnapinBase.Translate("CancelWizButton"); ! this._btnCancel.Click += new System.EventHandler(this.btnCancel_Click); // ! // _btnNext // ! this._btnNext.Location = new System.Drawing.Point(320, 352); ! this._btnNext.Name = "_btnNext"; ! this._btnNext.Size = new System.Drawing.Size(80, 24); ! this._btnNext.TabIndex = 2; ! this._btnNext.Text = SnapinBase.Translate("NextWizButton"); ! this._btnNext.Click += new System.EventHandler(this.btnNext_Click); // ! // _btnBack // ! this._btnBack.Location = new System.Drawing.Point(240, 352); ! this._btnBack.Name = "_btnBack"; ! this._btnBack.Size = new System.Drawing.Size(80, 24); ! this._btnBack.TabIndex = 3; ! this._btnBack.Text = SnapinBase.Translate("BackWizButton"); ! this._btnBack.Click += new System.EventHandler(this.btnBack_Click); // // WizardBase // ! this.AcceptButton = this._btnNext; this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); ! this.CancelButton = this._btnCancel; ! this.ClientSize = new System.Drawing.Size(496, 378); ! this.Controls.Add(this._btnBack); ! this.Controls.Add(this._btnNext); ! this.Controls.Add(this._btnCancel); ! this.Controls.Add(this.m_tabWizardPages); this.MaximizeBox = false; this.MinimizeBox = false; *************** *** 325,332 **** private void btnBack_Click (object sender, System.EventArgs e) { ! int current = tabWizardPages.SelectedIndex; if(current > 0) { ! tabWizardPages.SelectedIndex = current - 1; } InitButtons(); --- 318,325 ---- private void btnBack_Click (object sender, System.EventArgs e) { ! int current = m_tabWizardPages.SelectedIndex; if(current > 0) { ! m_tabWizardPages.SelectedIndex = current - 1; } InitButtons(); *************** *** 335,343 **** private void btnNext_Click (Object sender, System.EventArgs e) { ! int current = tabWizardPages.SelectedIndex; ! int max = tabWizardPages.TabCount; if(current < (max-1)) { ! tabWizardPages.SelectedIndex = current + 1; InitButtons(); } --- 328,336 ---- private void btnNext_Click (Object sender, System.EventArgs e) { ! int current = m_tabWizardPages.SelectedIndex; ! int max = m_tabWizardPages.TabCount; if(current < (max-1)) { ! m_tabWizardPages.SelectedIndex = current + 1; InitButtons(); } *************** *** 381,385 **** /// The form to show. /// </summary> ! class WizardThread { protected WizardBase m_Form; --- 374,378 ---- /// The form to show. /// </summary> ! internal class WizardThread { protected WizardBase m_Form; Index: WizardBase.resx =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Wizards/WizardBase.resx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WizardBase.resx 31 Mar 2004 07:58:46 -0000 1.1 --- WizardBase.resx 19 Jan 2005 23:56:04 -0000 1.2 *************** *** 1,42 **** ! <?xml version="1.0" encoding="utf-8" ?> <root> ! <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> ! <xsd:element name="root" msdata:IsDataSet="true"> ! <xsd:complexType> ! <xsd:choice maxOccurs="unbounded"> ! <xsd:element name="data"> ! <xsd:complexType> ! <xsd:sequence> ! <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> ! <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> ! </xsd:sequence> ! <xsd:attribute name="name" type="xsd:string" /> ! <xsd:attribute name="type" type="xsd:string" /> ! <xsd:attribute name="mimetype" type="xsd:string" /> ! </xsd:complexType> ! </xsd:element> ! <xsd:element name="resheader"> ! <xsd:complexType> ! <xsd:sequence> ! <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> ! </xsd:sequence> ! <xsd:attribute name="name" type="xsd:string" use="required" /> ! </xsd:complexType> ! </xsd:element> ! </xsd:choice> ! </xsd:complexType> ! </xsd:element> ! </xsd:schema> ! <resheader name="ResMimeType"> ! <value>text/microsoft-resx</value> ! </resheader> ! <resheader name="Version"> ! <value>1.0.0.0</value> ! </resheader> ! <resheader name="Reader"> ! <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> ! </resheader> ! <resheader name="Writer"> ! <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> ! </resheader> ! </root> --- 1,175 ---- ! <?xml version="1.0" encoding="utf-8"?> <root> ! <!-- ! Microsoft ResX Schema ! ! Version 1.3 ! ! The primary goals of this format is to allow a simple XML format ! that is mostly human readable. The generation and parsing of the ! various data types are done through the TypeConverter classes ! associated with the data types. ! ! Example: ! ! ... ado.net/XML headers & schema ... ! <resheader name="resmimetype">text/microsoft-resx</resheader> ! <resheader name="version">1.3</resheader> ! <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> ! <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> ! <data name="Name1">this is my long string</data> ! <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> ! <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> ! [base64 mime encoded serialized .NET Framework object] ! </data> ! <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> ! [base64 mime encoded string representing a byte array form of the .NET Framework object] ! </data> ! ! There are any number of "resheader" rows that contain simple ! name/value pairs. ! ! Each data row contains a name, and value. The row also contains a ! type or mimetype. Type corresponds to a .NET class that support ! text/value conversion through the TypeConverter architecture. ! Classes that don't support this are serialized and stored with the ! mimetype set. ! ! The mimetype is used forserialized objects, and tells the ! ResXResourceReader how to depersist the object. This is currently not ! extensible. For a given mimetype the value must be set accordingly: ! ! Note - application/x-microsoft.net.object.binary.base64 is the format ! that the ResXResourceWriter will generate, however the reader can ! read any of the formats listed below. ! ! mimetype: application/x-microsoft.net.object.binary.base64 ! value : The object must be serialized with ! : System.Serialization.Formatters.Binary.BinaryFormatter ! : and then encoded with base64 encoding. ! ! mimetype: application/x-microsoft.net.object.soap.base64 ! value : The object must be serialized with ! : System.Runtime.Serialization.Formatters.Soap.SoapFormatter ! : and then encoded with base64 encoding. ! ! mimetype: application/x-microsoft.net.object.bytearray.base64 ! value : The object must be serialized into a byte array ! : using a System.ComponentModel.TypeConverter ! : and then encoded with base64 encoding. ! --> ! <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> ! <xsd:element name="root" msdata:IsDataSet="true"> ! <xsd:complexType> ! <xsd:choice maxOccurs="unbounded"> ! <xsd:element name="data"> ! <xsd:complexType> ! <xsd:sequence> ! <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> ! <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> ! </xsd:sequence> ! <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" /> ! <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> ! <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> ! </xsd:complexType> ! </xsd:element> ! <xsd:element name="resheader"> ! <xsd:complexType> ! <xsd:sequence> ! <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> ! </xsd:sequence> ! <xsd:attribute name="name" type="xsd:string" use="required" /> ! </xsd:complexType> ! </xsd:element> ! </xsd:choice> ! </xsd:complexType> ! </xsd:element> ! </xsd:schema> ! <resheader name="resmimetype"> ! <value>text/microsoft-resx</value> ! </resheader> ! <resheader name="version"> ! <value>1.3</value> ! </resheader> ! <resheader name="reader"> ! <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> ! </resheader> ! <resheader name="writer"> ! <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> ! </resheader> ! <data name="m_tabWizardPages.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>True</value> ! </data> ! <data name="m_tabWizardPages.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>False</value> ! </data> ! <data name="m_tabWizardPages.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>True</value> ! </data> ! <data name="m_tabWizardPages.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Family</value> ! </data> ! <data name="m_tabWizardPages.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> ! </data> ! <data name="m_tabWizardPages.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> ! <value>8, 8</value> ! </data> ! <data name="_btnCancel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>False</value> ! </data> ! <data name="_btnCancel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> ! </data> ! <data name="_btnCancel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> ! </data> ! <data name="_btnNext.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>False</value> ! </data> ! <data name="_btnNext.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> ! </data> ! <data name="_btnNext.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> ! </data> ! <data name="_btnBack.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>False</value> ! </data> ! <data name="_btnBack.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> ! </data> ! <data name="_btnBack.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> ! </data> ! <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>False</value> ! </data> ! <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>(Default)</value> ! </data> ! <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>False</value> ! </data> ! <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>False</value> ! </data> ! <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> ! <value>8, 8</value> ! </data> ! <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>True</value> ! </data> ! <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>80</value> ! </data> ! <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>True</value> ! </data> ! <data name="$this.Name"> ! <value>WizardBase</value> ! </data> ! <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> ! </data> ! </root> \ No newline at end of file Index: WizardPage.resx =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Wizards/WizardPage.resx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WizardPage.resx 31 Mar 2004 07:58:46 -0000 1.1 --- WizardPage.resx 19 Jan 2005 23:56:04 -0000 1.2 *************** *** 98,144 **** <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> ! <data name="pnlHeader.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="pnlHeader.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </data> ! <data name="pnlHeader.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="pnlHeader.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>8, 8</value> </data> ! <data name="pnlHeader.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </data> ! <data name="pnlHeader.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="pictWizLogo.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="pictWizLogo.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="pictWizLogo.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Public</value> </data> ! <data name="lblExpandedDescription.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="lblExpandedDescription.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="lblExpandedDescription.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Family</value> </data> ! <data name="lblPageCaption.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="lblPageCaption.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="lblPageCaption.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Family</value> </data> --- 98,144 ---- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> ! <data name="_pnlHeader.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="_pnlHeader.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </data> ! <data name="_pnlHeader.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="_pnlHeader.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>8, 8</value> </data> ! <data name="_pnlHeader.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </data> ! <data name="_pnlHeader.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="m_pictWizLogo.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="m_pictWizLogo.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="m_pictWizLogo.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Family</value> </data> ! <data name="m_lblExpandedDescription.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="m_lblExpandedDescription.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="m_lblExpandedDescription.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Family</value> </data> ! <data name="m_lblPageCaption.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="m_lblPageCaption.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="m_lblPageCaption.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Family</value> </data> *************** *** 152,158 **** <value>True</value> </data> - <data name="$this.Name"> - <value>WizardPage</value> - </data> <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> --- 152,155 ---- *************** *** 167,170 **** --- 164,170 ---- <value>False</value> </data> + <data name="$this.Name"> + <value>WizardPage</value> + </data> <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-19 23:54:19
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/Resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16613 Added Files: i18n.nl.resx i18n.resx Log Message: Added i18n support --- NEW FILE: i18n.resx --- <?xml version="1.0" encoding="utf-8" ?> <root> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> <xsd:choice maxOccurs="unbounded"> <xsd:element name="data"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string" /> <xsd:attribute name="mimetype" type="xsd:string" /> </xsd:complexType> </xsd:element> <xsd:element name="resheader"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> </xsd:element> </xsd:choice> </xsd:complexType> </xsd:element> </xsd:schema> <resheader name="ResMimeType"> <value>text/microsoft-resx</value> </resheader> <resheader name="Version"> <value>1.0.0.0</value> </resheader> <resheader name="Reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="Writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <data name="FatalError"> <value>Fatal Error</value> </data> <data name="CehErrorInfo"> <value>An error occurred please contact the administrator with the following information:</value> </data> <data name="StackTrace"> <value>Stack Trace</value> </data> <data name="ApplicationError"> <value>Application Error</value> </data> <data name="Name"> <value>Name</value> </data> <data name="Properties"> <value>Properties</value> </data> <data name="Apply"> <value>Apply</value> </data> <data name="Cancel"> <value>Cancel</value> </data> <data name="Ok"> <value>OK</value> </data> <data name="OnCancelWarningText"> <value>Some property data may have changed. Do you want to save your changes?</value> </data> <data name="OnCancelWarningTitle"> <value>Save Changes?</value> </data> <data name="FinishWizButton"> <value>&Finish</value> </data> <data name="NextWizButton"> <value>&Next ></value> </data> <data name="BackWizButton"> <value>< &Back</value> </data> <data name="CancelWizButton"> <value>&Cancel</value> </data> </root> --- NEW FILE: i18n.nl.resx --- <?xml version="1.0" encoding="utf-8" ?> <root> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> <xsd:choice maxOccurs="unbounded"> <xsd:element name="data"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string" /> <xsd:attribute name="mimetype" type="xsd:string" /> </xsd:complexType> </xsd:element> <xsd:element name="resheader"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> </xsd:element> </xsd:choice> </xsd:complexType> </xsd:element> </xsd:schema> <resheader name="ResMimeType"> <value>text/microsoft-resx</value> </resheader> <resheader name="Version"> <value>1.0.0.0</value> </resheader> <resheader name="Reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="Writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <data name="FatalError"> <value>Fatale fout</value> </data> <data name="CehErrorInfo"> <value>Er is een fout opgetreden, neem contact op met de systeembeheerdeer met de volgende informatie:</value> </data> <data name="StackTrace"> <value>Stack Trace</value> </data> <data name="ApplicationError"> <value>Applicatie fout</value> </data> <data name="FolderNodeFirstColName"> <value>Naam</value> </data> <data name="Properties"> <value>Eigenschappen</value> </data> <data name="Apply"> <value>Toepassen</value> </data> <data name="Cancel"> <value>Annuleren</value> </data> <data name="Ok"> <value>OK</value> </data> <data name="OnCancelWarningText"> <value>Er zijn mogelijk instellingen gewijzigd. Wilt u deze wijzigingen opslaan?</value> </data> <data name="OnCancelWarningTitle"> <value>Wijzigingen opslaan?</value> </data> <data name="Finish"> <value>Voltooien</value> </data> <data name="Next"> <value>Volgende ></value> </data> <data name="Back"> <value>< Vorige</value> </data> </root> |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-19 23:52:40
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/Resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16118/Resources Log Message: Directory /cvsroot/mmclibrary/mmclibrary/MMCLib2/Resources added to the repository |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-19 23:52:05
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/PropertyPages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15866 Modified Files: PropertyPage.cs PropertyPageBase.cs PropertyPageSettings.cs PropertySheet.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 moved 'ShowModalPropertyPages' to PropertyPageSettings.cs Index: PropertyPageBase.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/PropertyPages/PropertyPageBase.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PropertyPageBase.cs 5 Dec 2004 03:22:13 -0000 1.7 --- PropertyPageBase.cs 19 Jan 2005 23:51:38 -0000 1.8 *************** *** 29,35 **** // #region ! protected PropertyPage m_propertypage; ! protected PropertyPageAction m_action; #endregion --- 29,35 ---- // #region ! private PropertyPage _propertypage; ! private PropertyPageAction _action; #endregion *************** *** 40,57 **** #region /// <summary> ! /// Get the property-page class /// </summary> public virtual PropertyPage PropertyPage { ! get { return this.m_propertypage; } set { ! System.Diagnostics.Debug.Assert(this.m_propertypage == null); System.Diagnostics.Debug.WriteLine(value); ! this.m_propertypage = value; // Register the eventhandlers too! ! this.m_propertypage.apply += new EventHandler(onApplyEvent); ! this.m_propertypage.validate += new EventHandler(onValidateEvent); ! this.m_propertypage.cancel += new EventHandler(onCancelEvent); this.Init(); } --- 40,57 ---- #region /// <summary> ! /// Get or set the property-page class /// </summary> public virtual PropertyPage PropertyPage { ! get { return this._propertypage; } set { ! System.Diagnostics.Debug.Assert(this._propertypage == null); System.Diagnostics.Debug.WriteLine(value); ! this._propertypage = value; // Register the eventhandlers too! ! this._propertypage.apply += new EventHandler(onApplyEvent); ! this._propertypage.validate += new EventHandler(onValidateEvent); ! this._propertypage.cancel += new EventHandler(onCancelEvent); this.Init(); } *************** *** 66,70 **** { // doesn't this fail ? ! return this.m_propertypage.Node; } } --- 66,70 ---- { // doesn't this fail ? ! return this.PropertyPage.Node; } } *************** *** 104,109 **** public PropertyPageAction Action { ! get{ return m_action;} ! set {m_action = value;} } #endregion --- 104,109 ---- public PropertyPageAction Action { ! get{ return _action;} ! set {_action = value;} } #endregion *************** *** 145,154 **** protected void ActivateApplyBtn(object sender, System.EventArgs e) { ! this.m_propertypage.PropertySheet.ActivateApplyButton(); } protected void DeactivateApplyBtn(object sender, System.EventArgs e) { ! this.m_propertypage.PropertySheet.DeactivateApplyButton(); } --- 145,154 ---- protected void ActivateApplyBtn(object sender, System.EventArgs e) { ! this._propertypage.PropertySheet.ActivateApplyButton(); } protected void DeactivateApplyBtn(object sender, System.EventArgs e) { ! this._propertypage.PropertySheet.DeactivateApplyButton(); } *************** *** 158,162 **** // The apply button is only active if there is something to apply, // if it isn't active the OK action should only cancel, not apply+cancel ! if((this.m_propertypage.PropertySheet).IsApplyEnabled()) { this.onApply(); --- 158,162 ---- // The apply button is only active if there is something to apply, // if it isn't active the OK action should only cancel, not apply+cancel ! if((this._propertypage.PropertySheet).IsApplyEnabled()) { this.onApply(); Index: PropertyPageSettings.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/PropertyPages/PropertyPageSettings.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PropertyPageSettings.cs 5 Dec 2004 03:22:13 -0000 1.1 --- PropertyPageSettings.cs 19 Jan 2005 23:51:38 -0000 1.2 *************** *** 26,29 **** --- 26,30 ---- #region private helpers bool _useCancelDialogs = true; + bool _showModelPropertySheets = false; #endregion *************** *** 37,40 **** --- 38,47 ---- } + public bool ShowModalPropertySheets + { + get{return _showModelPropertySheets;} + set{_showModelPropertySheets = value;} + } + #endregion } Index: PropertySheet.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/PropertyPages/PropertySheet.cs,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** PropertySheet.cs 5 Dec 2004 03:22:13 -0000 1.12 --- PropertySheet.cs 19 Jan 2005 23:51:38 -0000 1.13 *************** *** 23,77 **** public class PropertySheet : Form { //Added by Alexander Ovchinnikov for close PS after remove node ! public OnUserDelegate m_CloseHandle = null; /////////////////////////////////////////////////////////////////////// // ! // Member variables // #region - // Lesley v. Zijl: made protected for subclasses. - /// <summary> - /// The OK button - /// </summary> - protected Button m_btnOk; - - // Lesley v. Zijl: made protected for subclasses. - /// <summary> - /// The Cancel button - /// </summary> - protected Button m_btnCancel; - - // Lesley v. Zijl: made protected for subclasses. - /// <summary> - /// Apply button - /// </summary> - protected Button m_btnApply; - - /// <summary> - /// The tab control - /// </summary> - PropertySheetTabControl m_tc; - - /// <summary> - /// Typed collection of PropertyPages to display - /// </summary> - PropertyPageList m_allPages = new PropertyPageList(); ! /// <summary> ! /// closed flag used to hide and not dispose of the form ! /// </summary> ! bool m_fClosed; - /// <summary> - /// The node that we represent properties for - /// </summary> - BaseNode m_ParentNode; - /// <summary> - /// - /// </summary> - protected ResultViewItem m_resultviewitem; - #endregion /////////////////////////////////////////////////////////////////////// --- 23,50 ---- public class PropertySheet : Form { + private OnUserDelegate _closeHandle = null; //Added by Alexander Ovchinnikov for close PS after remove node ! ! /// <summary> ! /// ! /// </summary> ! protected ResultViewItem m_resultviewitem; /////////////////////////////////////////////////////////////////////// // ! // Private vars // #region ! private Button _btnOk; ! private Button _btnCancel; ! private Button _btnApply; ! private PropertySheetTabControl _tc; ! private PropertyPageList _allPages = new PropertyPageList(); ! private bool _fClosed; ! private BaseNode _parentNode; ! #endregion /////////////////////////////////////////////////////////////////////// *************** *** 89,125 **** /// <summary> ! /// The Typed pages collection we display /// </summary> public PropertyPageList Pages { ! get{ return m_allPages; } } /// <summary> ! /// The Tab control /// </summary> public PropertySheetTabControl Tabs { ! get{ return m_tc; } } /// <summary> ! /// the node this propertysheet represents /// </summary> public BaseNode Node { ! get { return m_ParentNode; } } /// <summary> ! /// Is the fake closed flag enabled on? i.e. is the form hidden? /// </summary> public bool isClosed { ! get { return m_fClosed; } } /// <summary> - /// Added by Lesley van Zijl /// Ask for the state of the ApplyButton /// </summary> --- 62,98 ---- /// <summary> ! /// Get the Typed pages collection we display /// </summary> public PropertyPageList Pages { ! get{ return _allPages; } } /// <summary> ! /// get the Tab control /// </summary> public PropertySheetTabControl Tabs { ! get{ return _tc; } } /// <summary> ! /// get the node this propertysheet represents /// </summary> public BaseNode Node { ! get { return _parentNode; } } /// <summary> ! /// returns if the fake closed flag is enabled i.e. is the form hidden? /// </summary> public bool isClosed { ! get { return _fClosed; } } + // Added by Lesley van Zijl /// <summary> /// Ask for the state of the ApplyButton /// </summary> *************** *** 127,131 **** public bool IsApplyEnabled() { ! return m_btnApply.Enabled; } #endregion --- 100,112 ---- public bool IsApplyEnabled() { ! return _btnApply.Enabled; ! } ! ! /// <summary> ! /// Returns the closehandle ! /// </summary> ! public OnUserDelegate CloseHandle ! { ! get { return _closeHandle; } } #endregion *************** *** 137,141 **** public PropertySheet(BaseNode node) { ! m_ParentNode = node; // Make sure nobody can resize this form --- 118,122 ---- public PropertySheet(BaseNode node) { ! _parentNode = node; // Make sure nobody can resize this form *************** *** 147,151 **** MinimizeBox = false; ! m_fClosed = false; //Added by Alexander Kachalkov --- 128,132 ---- MinimizeBox = false; ! _fClosed = false; //Added by Alexander Kachalkov *************** *** 155,161 **** //Added by Alexander Ovchinnikov for close PS after remove node //initialise closeDelegate ! if( m_CloseHandle == null ) { ! m_CloseHandle += new OnUserDelegate( ClosePropertySheet ); } } --- 136,142 ---- //Added by Alexander Ovchinnikov for close PS after remove node //initialise closeDelegate ! if( _closeHandle == null ) { ! _closeHandle += new OnUserDelegate( ClosePropertySheet ); } } *************** *** 166,169 **** --- 147,151 ---- public new DialogResult ShowDialog() { + Controls.Clear(); *************** *** 175,179 **** // We'll be as wide as the widest and tall as the tallest page ! foreach (PropertyPage page in m_allPages) { // Initialize the Property Pages --- 157,161 ---- // We'll be as wide as the widest and tall as the tallest page ! foreach (PropertyPage page in _allPages) { // Initialize the Property Pages *************** *** 186,204 **** // Tab Control should be on the top... ! m_tc = new PropertySheetTabControl(); // Add the pages to the sheet ! foreach (PropertyPage page in m_allPages) { // Create a Tab page that we can use ! m_tc.TabPages.Add(page.CreateTabPage()); } // Add the height of the tab thingy and the indentation ! m_tc.Location = new Point(4, 5); ! m_tc.SelectedIndexChanging += new CheckValidation(onTabPageChanged); ! m_tc.TabIndex = 0; ! Controls.Add(m_tc); // Adjust the height of of the tab control to account for the --- 168,186 ---- // Tab Control should be on the top... ! _tc = new PropertySheetTabControl(); // Add the pages to the sheet ! foreach (PropertyPage page in _allPages) { // Create a Tab page that we can use ! _tc.TabPages.Add(page.CreateTabPage()); } // Add the height of the tab thingy and the indentation ! _tc.Location = new Point(4, 5); ! _tc.SelectedIndexChanging += new CheckValidation(OnTabPageChanged); ! _tc.TabIndex = 0; ! Controls.Add(_tc); // Adjust the height of of the tab control to account for the *************** *** 207,218 **** // We need to do this so the Tab Control gets created on the Win32 side of // things, which makes m_tc.ItemSize.Height valid. ! IntPtr handle = m_tc.Handle; ! nHeight += m_tc.Location.Y + m_tc.ItemSize.Height; // calculate the tabcontrol height ! m_tc.Size = new System.Drawing.Size(nWidth, nHeight); nHeight = CalcTabHeight(nHeight); ! m_tc.Size = new System.Drawing.Size(nWidth, nHeight); // We'll have a 15 pixel buffer between the tab control and the buttons --- 189,200 ---- // We need to do this so the Tab Control gets created on the Win32 side of // things, which makes m_tc.ItemSize.Height valid. ! IntPtr handle = _tc.Handle; ! nHeight += _tc.Location.Y + _tc.ItemSize.Height; // calculate the tabcontrol height ! _tc.Size = new System.Drawing.Size(nWidth, nHeight); nHeight = CalcTabHeight(nHeight); ! _tc.Size = new System.Drawing.Size(nWidth, nHeight); // We'll have a 15 pixel buffer between the tab control and the buttons *************** *** 220,265 **** // Now put the Ok, Cancel, and Apply buttons on the page. ! m_btnApply = new Button(); ! m_btnApply.Size = new System.Drawing.Size(75, 23); ! m_btnApply.Location = new Point(nWidth-m_btnApply.Width+4, nHeight); ! m_btnApply.Text = "Apply"; ! m_btnApply.Enabled = false; ! m_btnApply.TabIndex = 3; ! m_btnApply.Click += new EventHandler(onApplyClick); //Added by Alexander Kachalkov ! m_btnApply.FlatStyle = FlatStyle.System; ! Controls.Add(m_btnApply); ! m_btnCancel = new Button(); ! m_btnCancel.Size = new System.Drawing.Size(75, 23); ! m_btnCancel.Location = new Point(m_btnApply.Location.X - m_btnCancel.Width-5, nHeight); ! m_btnCancel.Text = "Cancel"; ! m_btnCancel.Click += new EventHandler(onCancelClick); ! m_btnCancel.TabIndex = 2; //Added by Alexander Kachalkov ! m_btnCancel.FlatStyle = FlatStyle.System; ! Controls.Add(m_btnCancel); ! m_btnOk = new Button(); ! m_btnOk.Size = new System.Drawing.Size(75, 23); ! m_btnOk.Location = new Point(m_btnCancel.Location.X - m_btnOk.Width - 5, nHeight); ! m_btnOk.Text = "OK"; ! m_btnOk.TabIndex = 1; ! m_btnOk.Click += new EventHandler(onOkClick); //Added by Alexander Kachalkov ! m_btnOk.FlatStyle = FlatStyle.System; ! Controls.Add(m_btnOk); // Make sure we account for the height of the button ! nHeight +=m_btnOk.Height; // We have a 4 pixel margin on each side of the tab control, and a 5 pixel margin // between the buttons and the bottom of the page ClientSize = new System.Drawing.Size(nWidth + 8, nHeight + 5); ! this.AcceptButton = m_btnOk; ! this.CancelButton = m_btnCancel; //Added by Alexander Kachalkov ! base.Closing += new CancelEventHandler(onCloseClick); // And finally, make us actually show --- 202,247 ---- // Now put the Ok, Cancel, and Apply buttons on the page. ! _btnApply = new Button(); ! _btnApply.Size = new System.Drawing.Size(75, 23); ! _btnApply.Location = new Point(nWidth-_btnApply.Width+4, nHeight); ! _btnApply.Text = SnapinBase.Translate("Apply"); ! _btnApply.Enabled = false; ! _btnApply.TabIndex = 3; ! _btnApply.Click += new EventHandler(OnApplyClick); //Added by Alexander Kachalkov ! _btnApply.FlatStyle = FlatStyle.System; ! Controls.Add(_btnApply); ! _btnCancel = new Button(); ! _btnCancel.Size = new System.Drawing.Size(75, 23); ! _btnCancel.Location = new Point(_btnApply.Location.X - _btnCancel.Width-5, nHeight); ! _btnCancel.Text = SnapinBase.Translate("Cancel"); ! _btnCancel.Click += new EventHandler(OnCancelClick); ! _btnCancel.TabIndex = 2; //Added by Alexander Kachalkov ! _btnCancel.FlatStyle = FlatStyle.System; ! Controls.Add(_btnCancel); ! _btnOk = new Button(); ! _btnOk.Size = new System.Drawing.Size(75, 23); ! _btnOk.Location = new Point(_btnCancel.Location.X - _btnOk.Width - 5, nHeight); ! _btnOk.Text = SnapinBase.Translate("Ok"); ! _btnOk.TabIndex = 1; ! _btnOk.Click += new EventHandler(OnOkClick); //Added by Alexander Kachalkov ! _btnOk.FlatStyle = FlatStyle.System; ! Controls.Add(_btnOk); // Make sure we account for the height of the button ! nHeight += _btnOk.Height; // We have a 4 pixel margin on each side of the tab control, and a 5 pixel margin // between the buttons and the bottom of the page ClientSize = new System.Drawing.Size(nWidth + 8, nHeight + 5); ! this.AcceptButton = _btnOk; ! this.CancelButton = _btnCancel; //Added by Alexander Kachalkov ! base.Closing += new CancelEventHandler(OnCloseClick); // And finally, make us actually show *************** *** 275,284 **** private int CalcTabHeight(int origHeight) { ! int before = m_tc.TabPages[0].Size.Height; ! m_tc.Multiline = true; ! m_tc.SizeMode = TabSizeMode.FillToRight; ! return origHeight += (before - m_tc.TabPages[0].Size.Height); } /////////////////////////////////////////////////////////////////////// --- 257,266 ---- private int CalcTabHeight(int origHeight) { ! int before = _tc.TabPages[0].Size.Height; ! _tc.Multiline = true; ! _tc.SizeMode = TabSizeMode.FillToRight; ! return origHeight += (before - _tc.TabPages[0].Size.Height); } /////////////////////////////////////////////////////////////////////// *************** *** 294,305 **** /// </summary> /// <returns></returns> ! bool onTabPageChanged() { bool isValidData; ! PropertyPage page = m_allPages[m_tc.SelectedIndex]; isValidData = page.ValidateData(); if (isValidData) { ! foreach(PropertyPage pages in m_allPages) pages.TabChange(); } --- 276,287 ---- /// </summary> /// <returns></returns> ! bool OnTabPageChanged() { bool isValidData; ! PropertyPage page = _allPages[_tc.SelectedIndex]; isValidData = page.ValidateData(); if (isValidData) { ! foreach(PropertyPage pages in _allPages) pages.TabChange(); } *************** *** 310,314 **** //Added by Alexander Kachalkov //to be able to show form again after closing it ! void onCloseClick(Object o, CancelEventArgs e) { Node.EditMode = false; --- 292,296 ---- //Added by Alexander Kachalkov //to be able to show form again after closing it ! void OnCloseClick(Object o, CancelEventArgs e) { Node.EditMode = false; *************** *** 324,330 **** /// <param name="o"></param> /// <param name="e"></param> ! void onOkClick(Object o, EventArgs e) { ! PropertyPage page = m_allPages[m_tc.SelectedIndex]; if (page.ValidateData()) --- 306,312 ---- /// <param name="o"></param> /// <param name="e"></param> ! void OnOkClick(Object o, EventArgs e) { ! PropertyPage page = _allPages[_tc.SelectedIndex]; if (page.ValidateData()) *************** *** 333,337 **** base.DialogResult = DialogResult.OK; ! onApplyClick(o, e); FakeClose(); } --- 315,319 ---- base.DialogResult = DialogResult.OK; ! OnApplyClick(o, e); FakeClose(); } *************** *** 343,356 **** /// <param name="o"></param> /// <param name="e"></param> ! 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?", ! "Save Changes?", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Warning)) { case DialogResult.Yes: ! onApplyClick(o, e); break; --- 325,338 ---- /// <param name="o"></param> /// <param name="e"></param> ! void OnCancelClick(Object o, EventArgs e) { if(IsApplyEnabled() == true && PropertyPageSettings.Instance.UseCancelDialogs == true) { ! switch(MessageBox.Show(SnapinBase.Translate("OnCancelWarningText"), ! SnapinBase.Translate("OnCancelWarningTitle"), MessageBoxButtons.YesNoCancel, MessageBoxIcon.Warning)) { case DialogResult.Yes: ! OnApplyClick(o, e); break; *************** *** 363,367 **** base.DialogResult = DialogResult.Cancel; ! foreach(PropertyPage page in m_allPages) page.onCancel(); FakeClose(); --- 345,349 ---- base.DialogResult = DialogResult.Cancel; ! foreach(PropertyPage page in _allPages) page.onCancel(); FakeClose(); *************** *** 373,377 **** base.DialogResult = DialogResult.Cancel; ! foreach(PropertyPage page in m_allPages) page.onCancel(); FakeClose(); --- 355,359 ---- base.DialogResult = DialogResult.Cancel; ! foreach(PropertyPage page in _allPages) page.onCancel(); FakeClose(); *************** *** 386,397 **** /// <param name="o"></param> /// <param name="e"></param> ! void onApplyClick(Object o, EventArgs e) { ! PropertyPage psp = m_allPages[m_tc.SelectedIndex]; if (psp.ValidateData()) { SendApplyToAll(); ! m_btnApply.Enabled = false; } } --- 368,379 ---- /// <param name="o"></param> /// <param name="e"></param> ! void OnApplyClick(Object o, EventArgs e) { ! PropertyPage psp = _allPages[_tc.SelectedIndex]; if (psp.ValidateData()) { SendApplyToAll(); ! _btnApply.Enabled = false; } } *************** *** 403,408 **** public void ActivateApplyButton() { ! if (m_btnApply != null) ! m_btnApply.Enabled = true; } --- 385,390 ---- public void ActivateApplyButton() { ! if (_btnApply != null) ! _btnApply.Enabled = true; } *************** *** 412,417 **** public void DeactivateApplyButton() { ! if(m_btnApply != null) ! m_btnApply.Enabled = false; } --- 394,399 ---- public void DeactivateApplyButton() { ! if(_btnApply != null) ! _btnApply.Enabled = false; } *************** *** 421,425 **** private void SendApplyToAll() { ! foreach(PropertyPage page in m_allPages) { page.Applied = true; --- 403,407 ---- private void SendApplyToAll() { ! foreach(PropertyPage page in _allPages) { page.Applied = true; *************** *** 436,440 **** this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); this.ClientSize = new System.Drawing.Size(292, 273); ! this.Name = "PropertySheet"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; //this.TopMost = true; --- 418,422 ---- this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); this.ClientSize = new System.Drawing.Size(292, 273); ! this.Name = SnapinBase.Translate("Properties"); this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; //this.TopMost = true; *************** *** 450,454 **** private void FakeClose() { ! m_fClosed = true; Close(); } --- 432,436 ---- private void FakeClose() { ! _fClosed = true; Close(); } *************** *** 459,463 **** base.DialogResult = DialogResult.Cancel; ! foreach(PropertyPage page in m_allPages) page.onCancel(); FakeClose(); --- 441,445 ---- base.DialogResult = DialogResult.Cancel; ! foreach(PropertyPage page in _allPages) page.onCancel(); FakeClose(); *************** *** 558,563 **** // Added by Alex Ovchinnikov for Dispose method in Propertysheet ! public override void Clear( ){ ! for( int iIndex = 0; iIndex < base.Count; iIndex++ ){ base[ iIndex ] = null; } --- 540,547 ---- // Added by Alex Ovchinnikov for Dispose method in Propertysheet ! public override void Clear( ) ! { ! for( int iIndex = 0; iIndex < base.Count; iIndex++ ) ! { base[ iIndex ] = null; } Index: PropertyPage.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/PropertyPages/PropertyPage.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PropertyPage.cs 5 Dec 2004 03:22:13 -0000 1.6 --- PropertyPage.cs 19 Jan 2005 23:51:38 -0000 1.7 *************** *** 18,55 **** // #region - /// <summary> - /// The property sheet we belong to - /// </summary> - protected PropertySheet m_PropSheet; ! /// <summary> ! /// The title of our page - string on the tab ! /// </summary> ! protected String m_sTitle; ! ! /// <summary> ! /// the type of control to activate int he page client area ! /// </summary> ! protected Type m_ControlType; ! ! /// <summary> ! /// the instance of the control once activated ! /// </summary> ! protected UserControl m_Control = null; ! ! /// <summary> ! /// A reference too the note before the sheet is initialised ! /// </summary> ! protected BaseNode m_node; ! ! /// <summary> ! /// Multiselection ! /// </summary> ! protected ArrayList m_items = new ArrayList(); - /// <summary> - /// Indicates if the Apply button is pressed - /// </summary> - protected bool m_applied = false; #endregion --- 18,30 ---- // #region ! private PropertySheet _propSheet; ! private String _sTitle; ! private Type _controlType; ! private UserControl _control = null; ! private BaseNode _node; ! private ArrayList _items = new ArrayList(); ! private bool _applied = false; #endregion *************** *** 87,132 **** #region /// <summary> ! /// Set the type of User Control to serve as the property page guts /// </summary> public Type ControlType { ! get { return m_ControlType; } ! set { m_ControlType = value; } } /// <summary> ! /// Sets the PropertySheet we're the property page of /// </summary> public PropertySheet PropertySheet { ! set { m_PropSheet = value; } ! get { return m_PropSheet; } } /// <summary> ! /// A reference to the node before init of the sheet /// </summary> public BaseNode Node { ! get{ return m_node;} } /// <summary> ! /// Setter for items. The set property makes a copy of the items passed in. If /// null is passed as a value, a zero-length array is allocated instead. /// </summary> public ArrayList Items { ! get { return this.m_items; } set { if(value == null) ! this.m_items = new ArrayList(); else ! this.m_items = value; } } public UserControl MainControl { --- 62,110 ---- #region /// <summary> ! /// Set or get the type of User Control to serve as the property page guts /// </summary> public Type ControlType { ! get { return _controlType; } ! set { _controlType = value; } } /// <summary> ! /// Set or get the PropertySheet we're the property page of /// </summary> public PropertySheet PropertySheet { ! set { _propSheet = value; } ! get { return _propSheet; } } /// <summary> ! /// returns a reference to the node before init of the sheet /// </summary> public BaseNode Node { ! get{ return _node;} } /// <summary> ! /// Setter or getter for items. The set property makes a copy of the items passed in. If /// null is passed as a value, a zero-length array is allocated instead. /// </summary> public ArrayList Items { ! get { return this._items; } set { if(value == null) ! this._items = new ArrayList(); else ! this._items = value; } } + /// <summary> + /// Returns the usercontrol that is hosted on this propertypage + /// </summary> public UserControl MainControl { *************** *** 135,145 **** try { ! if (m_Control == null) { ! m_Control = (UserControl)Activator.CreateInstance(ControlType); // check if the usercontrol implements IPropertyPageContext // if so provide a back reference to ourselves. ! IPropertyPageContext ctx = m_Control as IPropertyPageContext; if(ctx != null) ctx.PropertyPage = this; --- 113,123 ---- try { ! if (_control == null) { ! _control = (UserControl)Activator.CreateInstance(ControlType); // check if the usercontrol implements IPropertyPageContext // if so provide a back reference to ourselves. ! IPropertyPageContext ctx = _control as IPropertyPageContext; if(ctx != null) ctx.PropertyPage = this; *************** *** 151,170 **** throw new SnapinException ("Failed to create user control", e); } ! return m_Control; } } /// <summary> ! /// The string displayed in the tab /// </summary> public String Title { ! get { return m_sTitle; } ! set { m_sTitle = value; } } /// <summary> ! /// size of the property sheet page /// </summary> public Size Size --- 129,148 ---- throw new SnapinException ("Failed to create user control", e); } ! return _control; } } /// <summary> ! /// get or set the string displayed in the tab /// </summary> public String Title { ! get { return _sTitle; } ! set { _sTitle = value; } } /// <summary> ! /// get or set the size of the property sheet page /// </summary> public Size Size *************** *** 174,181 **** } public bool Applied { ! get { return m_applied;} ! set { m_applied = value;} } --- 152,162 ---- } + /// <summary> + /// get or set if this propertypage's apply button is clicked + /// </summary> public bool Applied { ! get { return _applied;} ! set { _applied = value;} } *************** *** 198,207 **** public PropertyPage(string title) { ! m_sTitle = title; } public PropertyPage(string title, BaseNode node) : this(title) { ! m_node = node; } --- 179,188 ---- public PropertyPage(string title) { ! _sTitle = title; } public PropertyPage(string title, BaseNode node) : this(title) { ! _node = node; } *************** *** 227,231 **** /// <summary> ! /// Generate the actual TabPage that will used in the PropertySheet. /// We don't keep re-using the same TabPage each time /// the property page is created because it makes the --- 208,212 ---- /// <summary> ! /// Generate the actual TabPage that will used in the PropertySheet. /// We don't keep re-using the same TabPage each time /// the property page is created because it makes the *************** *** 310,314 **** protected void ActivateApply() { ! m_PropSheet.ActivateApplyButton(); } --- 291,295 ---- protected void ActivateApply() { ! _propSheet.ActivateApplyButton(); } *************** *** 318,322 **** protected void DeactivateApply() { ! m_PropSheet.DeactivateApplyButton(); } --- 299,303 ---- protected void DeactivateApply() { ! _propSheet.DeactivateApplyButton(); } |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-19 23:45:18
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/NodeEvents In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13918 Modified Files: NodeEvents.cs Log Message: Changed a lot of protected variables that where storage for properties to private Method parameter names should use a camel case for their names Index: NodeEvents.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/NodeEvents/NodeEvents.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NodeEvents.cs 22 Jul 2004 14:07:05 -0000 1.2 --- NodeEvents.cs 19 Jan 2005 23:45:08 -0000 1.3 *************** *** 19,23 **** public class ActivateArgs : NodeEventArgs { ! public bool m_activate; public ActivateArgs(bool activate) --- 19,23 ---- public class ActivateArgs : NodeEventArgs { ! protected bool m_activate; public ActivateArgs(bool activate) *************** *** 29,33 **** public class AddImagesArgs : NodeEventArgs { ! public IImageList m_il; public AddImagesArgs(IImageList il) --- 29,33 ---- public class AddImagesArgs : NodeEventArgs { ! protected IImageList m_il; public AddImagesArgs(IImageList il) *************** *** 39,43 **** public class CommandArgs : NodeEventArgs { ! public int m_command; public CommandArgs(int command) --- 39,43 ---- public class CommandArgs : NodeEventArgs { ! protected int m_command; public CommandArgs(int command) *************** *** 49,53 **** public class ObjectArgs : NodeEventArgs { ! public object m_object; public ObjectArgs(object obj) --- 49,53 ---- public class ObjectArgs : NodeEventArgs { ! protected object m_object; public ObjectArgs(object obj) *************** *** 79,83 **** public IControlbar ControlBar {get{return m_ctrlbar;}set{m_ctrlbar=value;}} ! public ToolbarBaseArgs(IControlbar ControlBar, IToolbar Toolbar) {m_ctrlbar = ControlBar; m_toolbar = Toolbar;} } --- 79,83 ---- public IControlbar ControlBar {get{return m_ctrlbar;}set{m_ctrlbar=value;}} ! public ToolbarBaseArgs(IControlbar controlBar, IToolbar toolbar) {m_ctrlbar = controlBar; m_toolbar = toolbar;} } *************** *** 92,96 **** public bool bSelect {get{return m_bSelect;}} ! public SetToolbarArgs(IControlbar Controlbar, IToolbar Toolbar, bool bScope, bool bSelect):base(Controlbar, Toolbar) {m_bScope = bScope; m_bSelect = bSelect;} } --- 92,96 ---- public bool bSelect {get{return m_bSelect;}} ! public SetToolbarArgs(IControlbar controlbar, IToolbar toolbar, bool bScope, bool bSelect):base(controlbar, toolbar) {m_bScope = bScope; m_bSelect = bSelect;} } *************** *** 102,106 **** public MMC_CONSOLE_VERB verb {get{return m_verb;}} ! public ToolbarCommandArgs(IControlbar Controlbar, IToolbar Toolbar, MMC_CONSOLE_VERB verb):base(Controlbar, Toolbar) {m_verb = verb;} } --- 102,106 ---- public MMC_CONSOLE_VERB verb {get{return m_verb;}} ! public ToolbarCommandArgs(IControlbar controlbar, IToolbar toolbar, MMC_CONSOLE_VERB verb):base(controlbar, toolbar) {m_verb = verb;} } *************** *** 111,115 **** public string NewName {get{ return m_newName; } set {m_newName = value;}} ! public RenameArgs(string NewName) { m_newName = NewName;} } --- 111,115 ---- public string NewName {get{ return m_newName; } set {m_newName = value;}} ! public RenameArgs(string newName) { m_newName = newName;} } |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-19 23:29:40
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10490 Modified Files: SortListNode.cs Log Message: Changed a lot of protected variables that where storage for properties to private Index: SortListNode.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/SortListNode.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SortListNode.cs 1 Sep 2004 13:02:17 -0000 1.4 --- SortListNode.cs 19 Jan 2005 23:29:31 -0000 1.5 *************** *** 26,39 **** /// A cached reference to the MMC console /// </summary> ! protected IConsole2 m_Console = null; /// <summary> /// Underlying template for the listview control /// </summary> ! protected SortedList m_List = null; /// <summary> /// Underlying template for the listview control /// </summary> ! protected ArrayList m_HeaderInfo = null; #endregion --- 26,39 ---- /// A cached reference to the MMC console /// </summary> ! private IConsole2 _console = null; /// <summary> /// Underlying template for the listview control /// </summary> ! private SortedList _list = null; /// <summary> /// Underlying template for the listview control /// </summary> ! private ArrayList _headerInfo = null; #endregion *************** *** 49,53 **** public IHeaderCtrl2 HeaderCtrl { ! get { return (IHeaderCtrl2)m_Console; } } --- 49,53 ---- public IHeaderCtrl2 HeaderCtrl { ! get { return (IHeaderCtrl2)_console; } } *************** *** 58,62 **** public IResultData ResultData { ! get { return (IResultData)m_Console; } } --- 58,62 ---- public IResultData ResultData { ! get { return (IResultData)_console; } } *************** *** 66,77 **** public SortedList DataList { ! get{ return m_List; } ! set{ m_List = value; } } public ArrayList HeaderInfo { ! get{ return m_HeaderInfo; } ! set{ m_HeaderInfo = value; } } #endregion --- 66,77 ---- public SortedList DataList { ! get{ return _list; } ! set{ _list = value; } } public ArrayList HeaderInfo { ! get{ return _headerInfo; } ! set{ _headerInfo = value; } } #endregion *************** *** 108,112 **** public override void OnResultShow() { ! m_Console = m_Snapin.ResultViewConsole; // setup the header for the columns we want to show --- 108,112 ---- public override void OnResultShow() { ! _console = Snapin.ResultViewConsole; // setup the header for the columns we want to show *************** *** 130,137 **** public virtual void OnShowHeader( IHeaderCtrl2 header ){ try{ ! if( m_HeaderInfo != null) // Let's put in the column titles ! for( int iIndex = 0; iIndex < m_HeaderInfo.Count; iIndex++ ){ ! string name = m_HeaderInfo[ iIndex ] as string; int nWidth = (int)ColumnHeaderWidth.AUTO_WIDTH; header.InsertColumn( iIndex, name, (int)ColumnHeaderFormat.LEFT, nWidth ); --- 130,137 ---- public virtual void OnShowHeader( IHeaderCtrl2 header ){ try{ ! if( _headerInfo != null) // Let's put in the column titles ! for( int iIndex = 0; iIndex < _headerInfo.Count; iIndex++ ){ ! string name = _headerInfo[ iIndex ] as string; int nWidth = (int)ColumnHeaderWidth.AUTO_WIDTH; header.InsertColumn( iIndex, name, (int)ColumnHeaderFormat.LEFT, nWidth ); *************** *** 156,162 **** /// </summary> /// <param name="ResultData"></param> ! public virtual void OnShowData( IResultData ResultData ){ ! if( m_List != null ){ ! for( int iIndex = 0; iIndex < m_List.Count; iIndex++ ){ InsertItem( iIndex + 1 ); } --- 156,162 ---- /// </summary> /// <param name="ResultData"></param> ! public virtual void OnShowData( IResultData resultData ){ ! if( _list != null ){ ! for( int iIndex = 0; iIndex < _list.Count; iIndex++ ){ InsertItem( iIndex + 1 ); } *************** *** 236,240 **** /// <param name="ResultDataItem"></param> /// <param name="pItemID"></param> ! public virtual void GetItem( out RESULTDATAITEM ResultDataItem, uint pItemID ){ RESULTDATAITEM rdi = new RESULTDATAITEM(); --- 236,240 ---- /// <param name="ResultDataItem"></param> /// <param name="pItemID"></param> ! public virtual void GetItem( out RESULTDATAITEM resultDataItem, uint pItemID ){ RESULTDATAITEM rdi = new RESULTDATAITEM(); *************** *** 245,249 **** ResultData.GetItem( ref rdi ); ! ResultDataItem = rdi; } /// <summary> --- 245,249 ---- ResultData.GetItem( ref rdi ); ! resultDataItem = rdi; } /// <summary> *************** *** 283,287 **** /// <param name="nRow"></param> public virtual int GetItemLParam( int nRow ){ ! return m_iCookie | ( nRow << 16 ); } #endregion --- 283,287 ---- /// <param name="nRow"></param> public virtual int GetItemLParam( int nRow ){ ! return Cookie | ( nRow << 16 ); } #endregion |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-19 23:25:24
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9623 Modified Files: ReportNode.cs Log Message: Changed a lot of protected variables that where storage for properties to private moved 'ShowModalPropertyPages' to PropertyPageSettings.cs Added i18n support Method parameter names should use a camel case for their names Index: ReportNode.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/ReportNode.cs,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** ReportNode.cs 15 Nov 2004 19:42:52 -0000 1.23 --- ReportNode.cs 19 Jan 2005 23:25:14 -0000 1.24 *************** *** 21,25 **** ////////////////////////////////////////////////////////////////////// // ! // Members // #region --- 21,25 ---- ////////////////////////////////////////////////////////////////////// // ! // Private vars // #region *************** *** 28,32 **** /// A cached reference to the MMC console /// </summary> ! protected IConsole2 m_Console = null; // MAM: the filtersets that are active. --- 28,32 ---- /// A cached reference to the MMC console /// </summary> ! private IConsole2 _console = null; // MAM: the filtersets that are active. *************** *** 36,56 **** /// by testing if they occur anywhere within the value. /// </summary> ! protected Hashtable m_filters = null; ! ! /// <summary> ! /// The set of currently selected items. ! /// Multiselection is not done yet ! /// </summary> ! protected ResultViewItem[] m_currentSelectedItems = null; ! ! /// <summary> ! /// Used to get/set the resultview items. ! /// </summary> ! protected ArrayList m_items = new ArrayList(); ! /// <summary> ! /// Used to get/set the resultview items. ! /// </summary> ! protected ArrayList m_columns = new ArrayList(); #endregion --- 36,44 ---- /// by testing if they occur anywhere within the value. /// </summary> ! private Hashtable _filters = null; ! private ResultViewItem[] _currentSelectedItems = null; ! private ArrayList _items = new ArrayList(); ! private ArrayList _columns = new ArrayList(); #endregion *************** *** 66,70 **** public IHeaderCtrl2 HeaderCtrl { ! get { return (IHeaderCtrl2)m_Console; } } --- 54,58 ---- public IHeaderCtrl2 HeaderCtrl { ! get { return (IHeaderCtrl2)_console; } } *************** *** 75,79 **** public IResultData ResultData { ! get { return (IResultData)m_Console; } } --- 63,67 ---- public IResultData ResultData { ! get { return (IResultData)_console; } } *************** *** 83,88 **** public virtual ArrayList Items { ! get {return m_items;} ! set { m_items = value;} } --- 71,76 ---- public virtual ArrayList Items { ! get {return _items;} ! set { _items = value;} } *************** *** 92,97 **** public virtual ArrayList Columns { ! get { return m_columns; } ! set { m_columns = value;} } #endregion --- 80,85 ---- public virtual ArrayList Columns { ! get { return _columns; } ! set { _columns = value;} } #endregion *************** *** 122,126 **** { base.DisplayName = name; ! this.m_MultiSelectMode = multiselect; } --- 110,114 ---- { base.DisplayName = name; ! this.MultiSelectMode = multiselect; } *************** *** 136,140 **** string returnValue = base.GetResultViewType(ref pViewOptions); // Allow multiselect ! if(m_MultiSelectMode) pViewOptions |= (int)MMC_VIEW_OPTIONS.MULTISELECT; return returnValue; --- 124,128 ---- string returnValue = base.GetResultViewType(ref pViewOptions); // Allow multiselect ! if(MultiSelectMode) pViewOptions |= (int)MMC_VIEW_OPTIONS.MULTISELECT; return returnValue; *************** *** 169,173 **** { // Short-circuit the check if there are no filters. ! if(this.m_filters == null) return true; --- 157,161 ---- { // Short-circuit the check if there are no filters. ! if(this._filters == null) return true; *************** *** 176,183 **** // There are filters defined. Column-0 is as it is the display name of the item. ! foreach(int i in this.m_filters.Keys) { ResultViewColumn filterColumn = (ResultViewColumn)this.Columns[i]; ! String data = (String)this.m_filters[i]; String itemValue; if(filterColumn.Equals(col0)) --- 164,171 ---- // There are filters defined. Column-0 is as it is the display name of the item. ! foreach(int i in this._filters.Keys) { ResultViewColumn filterColumn = (ResultViewColumn)this.Columns[i]; ! String data = (String)this._filters[i]; String itemValue; if(filterColumn.Equals(col0)) *************** *** 202,212 **** } ! public override void GetDisplayInfo(ref RESULTDATAITEM ResultDataItem) { bool bCallbase = true; // the "cell" data ! int nRow = (ResultDataItem.lParam >> 16) - 1; ! int nCol = ResultDataItem.nCol; ArrayList myColumns = this.Columns; --- 190,200 ---- } ! public override void GetDisplayInfo(ref RESULTDATAITEM resultDataItem) { bool bCallbase = true; // the "cell" data ! int nRow = (resultDataItem.lParam >> 16) - 1; ! int nCol = resultDataItem.nCol; ArrayList myColumns = this.Columns; *************** *** 217,221 **** int maxItems = myItems.Count; ! if ((ResultDataItem.mask & (uint)RDI.STR) > 0) { if (nRow >= 0 && nRow < maxItems && nCol >= 0 && nCol < maxCol) --- 205,209 ---- int maxItems = myItems.Count; ! if ((resultDataItem.mask & (uint)RDI.STR) > 0) { if (nRow >= 0 && nRow < maxItems && nCol >= 0 && nCol < maxCol) *************** *** 233,237 **** bCallbase = false; } ! ResultDataItem.str = Marshal.StringToCoTaskMemUni(data); } --- 221,225 ---- bCallbase = false; } ! resultDataItem.str = Marshal.StringToCoTaskMemUni(data); } *************** *** 239,252 **** // small - 0 // large - 1 ! if ((ResultDataItem.mask & (uint)RDI.IMAGE) > 0) { if (nRow >= 0 && nRow < maxItems && nCol >= 0 && nCol < maxCol) { ! ResultDataItem.nImage = GetResultViewImageIndex((ResultViewItem)myItems[nRow]); bCallbase=false; } } if (bCallbase) ! base.GetDisplayInfo(ref ResultDataItem); } --- 227,240 ---- // small - 0 // large - 1 ! if ((resultDataItem.mask & (uint)RDI.IMAGE) > 0) { if (nRow >= 0 && nRow < maxItems && nCol >= 0 && nCol < maxCol) { ! resultDataItem.nImage = GetResultViewImageIndex((ResultViewItem)myItems[nRow]); bCallbase=false; } } if (bCallbase) ! base.GetDisplayInfo(ref resultDataItem); } *************** *** 313,322 **** System.Diagnostics.Debug.WriteLine("ReportNode::OnSelect"); ! this.m_currentSelectedItems = GetCurrentSelected(); bool havePropertyPage = false; ! for(int i=0; i<this.m_currentSelectedItems.Length; i++) { ! this.m_currentSelectedItems[i].OnSelect(); ! if(!havePropertyPage && this.m_currentSelectedItems[i].PropertyPages.Count != 0) { havePropertyPage = true; --- 301,310 ---- System.Diagnostics.Debug.WriteLine("ReportNode::OnSelect"); ! this._currentSelectedItems = GetCurrentSelected(); bool havePropertyPage = false; ! for(int i=0; i<this._currentSelectedItems.Length; i++) { ! this._currentSelectedItems[i].OnSelect(); ! if(!havePropertyPage && this._currentSelectedItems[i].PropertyPages.Count != 0) { havePropertyPage = true; *************** *** 359,365 **** } } ! for(int i=0; i<this.m_currentSelectedItems.Length; i++) { ! oldItems.Add(this.m_currentSelectedItems[i], null); } --- 347,353 ---- } } ! for(int i=0; i<this._currentSelectedItems.Length; i++) { ! oldItems.Add(this._currentSelectedItems[i], null); } *************** *** 377,383 **** } ! for(int i=0; i<this.m_currentSelectedItems.Length; i++) { ! if(newItems.ContainsKey(this.m_currentSelectedItems[i])) { // It was selected and is selected again --- 365,371 ---- } ! for(int i=0; i<this._currentSelectedItems.Length; i++) { ! if(newItems.ContainsKey(this._currentSelectedItems[i])) { // It was selected and is selected again *************** *** 386,394 **** { // It was selected, but is not selected now ! this.m_currentSelectedItems[i].OnDeselect(); } } ! this.m_currentSelectedItems = items; } --- 374,382 ---- { // It was selected, but is not selected now ! this._currentSelectedItems[i].OnDeselect(); } } ! this._currentSelectedItems = items; } *************** *** 399,404 **** public override void OnDeselectScope() { ! if(m_filters !=null ) ! this.m_filters.Clear(); base.OnDeselectScope(); } --- 387,392 ---- public override void OnDeselectScope() { ! if(_filters !=null ) ! this._filters.Clear(); base.OnDeselectScope(); } *************** *** 436,440 **** // to handle the form. //ThreadPool.QueueUserWorkItem(new WaitCallback(CreatePropertySheetForItems), (object)items[i]); ! if (ShowModalPropertySheet) CreatePropertySheetForItems((object)items[i]); else --- 424,428 ---- // to handle the form. //ThreadPool.QueueUserWorkItem(new WaitCallback(CreatePropertySheetForItems), (object)items[i]); ! if (PropertyPageSettings.Instance.ShowModalPropertySheets) CreatePropertySheetForItems((object)items[i]); else *************** *** 462,466 **** } ! m_item.PropertySheet.Text = m_item.DisplayName + " Properties"; IntPtr ctx = new System.IntPtr(); --- 450,454 ---- } ! m_item.PropertySheet.Text = m_item.DisplayName + " " + SnapinBase.Translate("Properties"); IntPtr ctx = new System.IntPtr(); *************** *** 488,496 **** { bool havePropertyPage = false; ! if(m_currentSelectedItems != null) { ! for(int i=0; i<this.m_currentSelectedItems.Length; i++) { ! if(this.m_currentSelectedItems[i].PropertyPages.Count > 0) { havePropertyPage = true; --- 476,484 ---- { bool havePropertyPage = false; ! if(_currentSelectedItems != null) { ! for(int i=0; i<this._currentSelectedItems.Length; i++) { ! if(this._currentSelectedItems[i].PropertyPages.Count > 0) { havePropertyPage = true; *************** *** 508,512 **** public override void OnResultShow() { ! m_Console = m_Snapin.ResultViewConsole; // setup the header for the columns we want to show --- 496,500 ---- public override void OnResultShow() { ! _console = Snapin.ResultViewConsole; // setup the header for the columns we want to show *************** *** 545,549 **** } ! public virtual void OnShowData(IResultData ResultData) { RESULTDATAITEM rdi = new RESULTDATAITEM(); --- 533,537 ---- } ! public virtual void OnShowData(IResultData resultData) { RESULTDATAITEM rdi = new RESULTDATAITEM(); *************** *** 566,571 **** // The low word contains the cookie for the node, while the high word // contains the row number + 1 we're inserting ! rdi.lParam = m_iCookie | (nRow << 16); ! ResultData.InsertItem(ref rdi); ((ResultViewItem)myItems[nRow - 1]).ItemID = (uint)rdi.itemID; } --- 554,559 ---- // The low word contains the cookie for the node, while the high word // contains the row number + 1 we're inserting ! rdi.lParam = Cookie | (nRow << 16); ! resultData.InsertItem(ref rdi); ((ResultViewItem)myItems[nRow - 1]).ItemID = (uint)rdi.itemID; } *************** *** 600,604 **** /// <param name="ResultDataItem"></param> /// <param name="pItemID"></param> ! public virtual void GetItem(out RESULTDATAITEM ResultDataItem, uint pItemID) { RESULTDATAITEM rdi = new RESULTDATAITEM(); --- 588,592 ---- /// <param name="ResultDataItem"></param> /// <param name="pItemID"></param> ! public virtual void GetItem(out RESULTDATAITEM resultDataItem, uint pItemID) { RESULTDATAITEM rdi = new RESULTDATAITEM(); *************** *** 609,613 **** ResultData.GetItem(ref rdi); ! ResultDataItem = rdi; } --- 597,601 ---- ResultData.GetItem(ref rdi); ! resultDataItem = rdi; } *************** *** 676,680 **** /// <param name="nRow"></param> public virtual int GetItemLParam(int nRow) { ! return m_iCookie | (nRow << 16); } #endregion --- 664,668 ---- /// <param name="nRow"></param> public virtual int GetItemLParam(int nRow) { ! return Cookie | (nRow << 16); } #endregion *************** *** 698,702 **** { case MMC_FILTER_CHANGE_CODE.MFCC_DISABLE: ! this.m_filters = null; break; case MMC_FILTER_CHANGE_CODE.MFCC_ENABLE: --- 686,690 ---- { case MMC_FILTER_CHANGE_CODE.MFCC_DISABLE: ! this._filters = null; break; case MMC_FILTER_CHANGE_CODE.MFCC_ENABLE: *************** *** 712,717 **** // Get the column object and set the string ! if(this.m_filters == null) ! this.m_filters = new Hashtable(); // Huh? We get a string back: instead of a null-ptr or zero-terminated string --- 700,705 ---- // Get the column object and set the string ! if(this._filters == null) ! this._filters = new Hashtable(); // Huh? We get a string back: instead of a null-ptr or zero-terminated string *************** *** 721,731 **** // TODO: get this verified/looked at by some COM guru. if (!Regex.IsMatch(strData, @"\w") || strData.Length >= (bufLen / 2)) ! this.m_filters.Remove(col); else ! this.m_filters[col] = strData; // Performance: unset the filter object when no filters are active. ! if(this.m_filters.Count == 0) ! this.m_filters = null; // Do a forced refresh of all items. --- 709,719 ---- // TODO: get this verified/looked at by some COM guru. if (!Regex.IsMatch(strData, @"\w") || strData.Length >= (bufLen / 2)) ! this._filters.Remove(col); else ! this._filters[col] = strData; // Performance: unset the filter object when no filters are active. ! if(this._filters.Count == 0) ! this._filters = null; // Do a forced refresh of all items. *************** *** 824,828 **** public virtual void RefreshResultConsole() { ! if(GetViewType() != (int)ViewMode.Filtered || this.m_filters == null) Snapin.SelectScopeNode(this); else --- 812,816 ---- public virtual void RefreshResultConsole() { ! if(GetViewType() != (int)ViewMode.Filtered || this._filters == null) Snapin.SelectScopeNode(this); else |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-19 23:05:32
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5321 Modified Files: ResultViewColumn.cs ResultViewItem.cs Log Message: Changed a lot of protected variables that where storage for properties to private Index: ResultViewColumn.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/ResultViewColumn.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ResultViewColumn.cs 22 Jul 2004 14:07:04 -0000 1.2 --- ResultViewColumn.cs 19 Jan 2005 23:05:14 -0000 1.3 *************** *** 14,31 **** // #region ! /// <summary> ! /// Used to get/set the name of the column ! /// </summary> ! protected String m_columnName; ! ! /// <summary> ! /// Used to get/set the format of the column ! /// </summary> ! protected int m_format; ! ! /// <summary> ! /// Used to get/set the Width of the Column ! /// </summary> ! protected int m_width; #endregion --- 14,20 ---- // #region ! private String _columnName; ! private int _format; ! private int _width; #endregion *************** *** 40,45 **** public String ColumnName { ! get { return m_columnName; } ! set { this.m_columnName = value; } } --- 29,34 ---- public String ColumnName { ! get { return _columnName; } ! set { this._columnName = value; } } *************** *** 49,54 **** public int Format { ! get { return this.m_format; } ! set { this.m_format = value; } } --- 38,43 ---- public int Format { ! get { return this._format; } ! set { this._format = value; } } *************** *** 58,63 **** public int Width { ! get { return this.m_width; } ! set { this.m_width = value; } } #endregion --- 47,52 ---- public int Width { ! get { return this._width; } ! set { this._width = value; } } #endregion *************** *** 71,75 **** /// Simple constructor for a left-aligned auto sized column. /// </summary> ! /// <param name="name"></param> public ResultViewColumn(String name) : this(name, (int)ColumnHeaderFormat.LEFT, (int)MMCLV.AUTO) { --- 60,64 ---- /// Simple constructor for a left-aligned auto sized column. /// </summary> ! /// <param name="name">The name of the column</param> public ResultViewColumn(String name) : this(name, (int)ColumnHeaderFormat.LEFT, (int)MMCLV.AUTO) { *************** *** 84,90 **** public ResultViewColumn(String name, int format, int width) { ! m_columnName = name; ! m_format = format; ! m_width = width; } #endregion --- 73,79 ---- public ResultViewColumn(String name, int format, int width) { ! this.ColumnName = name; ! this.Format = format; ! this.Width = width; } #endregion Index: ResultViewItem.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/ResultViewItem.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ResultViewItem.cs 7 Nov 2004 14:44:37 -0000 1.9 --- ResultViewItem.cs 19 Jan 2005 23:05:14 -0000 1.10 *************** *** 14,20 **** { - public static readonly System.Type Class = typeof(ResultViewItem); - - /////////////////////////////////////////////////////////////////////// // --- 14,17 ---- *************** *** 22,95 **** // #region - /// <summary> - /// Reference back to the snapin - /// </summary> - protected SnapinBase m_snapin; - - /// <summary> - /// Reference back to the snapin - /// </summary> - protected ReportNode m_node; ! /// <summary> ! /// Reference to the currently selected node ! /// </summary> ! protected bool m_selected; ! ! /// <summary> ! /// The Display name ! /// </summary> ! protected String m_displayName; ! ! /// <summary> ! /// Large Image Index ! /// </summary> ! protected int m_largeImage; ! ! /// <summary> ! /// Small Image Index ! /// </summary> ! protected int m_smallImage; ! ! /// <summary> ! /// ??? ! /// </summary> ! protected int m_dummy1; ! ! /// <summary> ! /// ??? ! /// </summary> ! protected int m_dummy2; ! ! /// <summary> ! /// The item-id as assigned by MMC. ! /// </summary> ! protected uint m_itemID; ! ! /// <summary> ! /// The property sheet for this item. ! /// </summary> ! protected PropertySheet m_propsheet; ! ! /// <summary> ! /// ! /// </summary> ! protected int m_image = -1; ! ! /// <summary> ! /// The details for this list-item. The keys are ResultViewItemColumn references, the values ! /// are the details (as Strings). ! /// </summary> ! protected Hashtable m_details = new Hashtable(); ! ! /// <summary> ! /// All "Task" menu items ! /// </summary> ! protected ArrayList m_tasks = null; ! ! /// <summary> ! /// All "Menu" menu items ! /// </summary> ! protected ArrayList m_menus = null; #endregion --- 19,37 ---- // #region ! private readonly static System.Type _class = typeof(ResultViewItem); ! private SnapinBase _snapin; ! private ReportNode _node; ! private bool _selected; ! private String _displayName; ! private int _largeImage; ! private int _smallImage; ! private int _dummy1; ! private int _dummy2; ! private uint _itemID; ! private PropertySheet _propsheet; ! private Hashtable _details = new Hashtable(); ! private ArrayList _tasks = null; ! private ArrayList _menus = null; #endregion *************** *** 98,101 **** --- 40,52 ---- // Properties // + + /// <summary> + /// + /// </summary> + public static System.Type Class + { + get { return _class; } + } + #region /// <summary> *************** *** 104,108 **** public SnapinBase SnapinBase { ! get { return m_snapin; } } --- 55,59 ---- public SnapinBase SnapinBase { ! get { return _snapin; } } *************** *** 112,125 **** public ReportNode Node { ! get { return m_node; } } /// <summary> ! /// /// </summary> public PropertySheet PropertySheet { ! get { return m_propsheet; } ! set { this.m_propsheet = value; } } --- 63,76 ---- public ReportNode Node { ! get { return _node; } } /// <summary> ! /// Get/set the property sheet for this item. /// </summary> public PropertySheet PropertySheet { ! get { return _propsheet; } ! set { this._propsheet = value; } } *************** *** 129,143 **** public String DisplayName { ! get { return m_displayName; } ! set { m_displayName = value; } } /// <summary> ! /// Get/set the selecteed status of this node /// </summary> public bool Selected { ! get { return m_selected; } ! set { m_selected = value; } } --- 80,94 ---- public String DisplayName { ! get { return _displayName; } ! set { _displayName = value; } } /// <summary> ! /// Get/set the selected status of this node /// </summary> public bool Selected { ! get { return _selected; } ! set { _selected = value; } } *************** *** 147,162 **** public uint ItemID { ! get { return this.m_itemID; } ! set { this.m_itemID = value; } } /// <summary> ! /// The details for this list-item. The keys are ResultViewItemColumn references, the values /// are the details (as Strings). /// </summary> public virtual Hashtable Details { ! get { return this.m_details; } ! set { this.m_details = value; } } --- 98,113 ---- public uint ItemID { ! get { return this._itemID; } ! set { this._itemID = value; } } /// <summary> ! /// Get/set the details for this list-item. The keys are ResultViewItemColumn references, the values /// are the details (as Strings). /// </summary> public virtual Hashtable Details { ! get { return this._details; } ! set { this._details = value; } } *************** *** 166,170 **** public virtual int LargeImage { ! get { return this.m_largeImage; } } --- 117,121 ---- public virtual int LargeImage { ! get { return this._largeImage; } } *************** *** 174,178 **** public virtual int SmallImage { ! get { return this.m_smallImage; } } --- 125,129 ---- public virtual int SmallImage { ! get { return this._smallImage; } } *************** *** 182,187 **** public virtual ArrayList Menus { ! get { return m_menus; } ! set { m_menus = value; } } --- 133,138 ---- public virtual ArrayList Menus { ! get { return _menus; } ! set { _menus = value; } } *************** *** 194,199 **** public virtual ArrayList Tasks { ! get { return m_tasks; } ! set { m_tasks = value;} } #endregion --- 145,150 ---- public virtual ArrayList Tasks { ! get { return _tasks; } ! set { _tasks = value;} } #endregion *************** *** 219,223 **** /// <param name="node">The reportnode-ext</param> /// <param name="displayName">The display name for the item. This is the only guaranteed visible column.</param> ! public ResultViewItem(SnapinBase snapin, ReportNode node, String displayName) : this(snapin, node, displayName, "", "") { } --- 170,175 ---- /// <param name="node">The reportnode-ext</param> /// <param name="displayName">The display name for the item. This is the only guaranteed visible column.</param> ! public ResultViewItem(SnapinBase snapin, ReportNode node, String displayName) : this(snapin, node, displayName, "", "") ! { } *************** *** 232,245 **** public ResultViewItem(SnapinBase snapin, ReportNode node, String displayName, String smallImageName, String largeImageName) { ! m_snapin = snapin; ! m_displayName = displayName; ! m_node = node; ! if(node.ResultPaneImages == null) { node.ResultPaneImages = new ImageList(); } ! m_largeImage = node.ResultPaneImages.Add(largeImageName); ! m_smallImage = node.ResultPaneImages.Add(smallImageName); ! m_dummy1 = node.ResultPaneImages.Add(largeImageName); ! m_dummy2 = node.ResultPaneImages.Add(smallImageName); } #endregion --- 184,198 ---- public ResultViewItem(SnapinBase snapin, ReportNode node, String displayName, String smallImageName, String largeImageName) { ! _snapin = snapin; ! _displayName = displayName; ! _node = node; ! if(node.ResultPaneImages == null) ! { node.ResultPaneImages = new ImageList(); } ! _largeImage = node.ResultPaneImages.Add(largeImageName); ! _smallImage = node.ResultPaneImages.Add(smallImageName); ! _dummy1 = node.ResultPaneImages.Add(largeImageName); ! _dummy2 = node.ResultPaneImages.Add(smallImageName); } #endregion *************** *** 250,254 **** /// <param name="col">The column object</param> /// <param name="detail">The detail-text</param> ! public virtual void AddDetail(ResultViewColumn col, String detail) { this.Details.Add(col, detail); } --- 203,208 ---- /// <param name="col">The column object</param> /// <param name="detail">The detail-text</param> ! public virtual void AddDetail(ResultViewColumn col, String detail) ! { this.Details.Add(col, detail); } *************** *** 257,261 **** /// Remove all details. /// </summary> ! public virtual void ClearDetail() { this.Details.Clear(); } --- 211,216 ---- /// Remove all details. /// </summary> ! public virtual void ClearDetail() ! { this.Details.Clear(); } *************** *** 266,276 **** /// <param name="key">The columnname we are looking for</param> /// <returns>The details for the column</returns> ! public virtual String GetDetail(ResultViewColumn key) { ! return (String)this.m_details[key]; } #region IMMCPropertyPage Members protected ArrayList m_propertypages = new ArrayList(); ! public virtual ArrayList PropertyPages { get { return m_propertypages; } set { m_propertypages = value;} --- 221,233 ---- /// <param name="key">The columnname we are looking for</param> /// <returns>The details for the column</returns> ! public virtual String GetDetail(ResultViewColumn key) ! { ! return (String)this._details[key]; } #region IMMCPropertyPage Members protected ArrayList m_propertypages = new ArrayList(); ! public virtual ArrayList PropertyPages ! { get { return m_propertypages; } set { m_propertypages = value;} *************** *** 284,288 **** /// </summary> /// <remarks>The default implementation does nothing</remarks> ! public virtual void OnSelect() { // Called when this item is selected. We do nothing in the default implementation. } --- 241,246 ---- /// </summary> /// <remarks>The default implementation does nothing</remarks> ! public virtual void OnSelect() ! { // Called when this item is selected. We do nothing in the default implementation. } *************** *** 293,297 **** /// </summary> /// <remarks>The default implementation does nothing</remarks> ! public virtual void OnDeselect() { // Called when this item is selected. We do nothing in the default implementation. } --- 251,256 ---- /// </summary> /// <remarks>The default implementation does nothing</remarks> ! public virtual void OnDeselect() ! { // Called when this item is selected. We do nothing in the default implementation. } |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-19 23:03:07
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4652 Modified Files: DataTableNode.cs FolderNode.cs FormNode.cs HTMLNode.cs OCXNode.cs Log Message: Changed a lot of protected variables that where storage for properties to private Added i18n support Method parameter names should use a camel case for their names Index: DataTableNode.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/DataTableNode.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DataTableNode.cs 1 Sep 2004 12:59:31 -0000 1.3 --- DataTableNode.cs 19 Jan 2005 23:02:46 -0000 1.4 *************** *** 24,43 **** // #region ! //Added by Alexander Kachalkov ! /// <summary> ! /// A cached reference to the MMC console ! /// </summary> ! protected IConsole2 m_Console = null; ! ! //Added by Arunjeet Singh ! /// <summary> ! /// Variable to hold the AutoRefresh property ! /// </summary> ! protected bool m_AutoRefresh = false; ! ! /// <summary> ! /// Underlying template for the listview control ! /// </summary> ! protected DataTable m_table = null; // MAM: the filtersets that are active. --- 24,30 ---- // #region ! private IConsole2 _console = null; ! private bool _autoRefresh = false; ! private DataTable _table = null; // MAM: the filtersets that are active. *************** *** 47,51 **** /// by testing if they occur anywhere within the value. /// </summary> ! protected Hashtable m_filters = null; #endregion --- 34,38 ---- /// by testing if they occur anywhere within the value. /// </summary> ! private Hashtable _filters = null; #endregion *************** *** 61,65 **** public IHeaderCtrl2 HeaderCtrl { ! get { return (IHeaderCtrl2)m_Console; } } --- 48,52 ---- public IHeaderCtrl2 HeaderCtrl { ! get { return (IHeaderCtrl2)_console; } } *************** *** 70,74 **** public IResultData ResultData { ! get { return (IResultData)m_Console; } } /// <summary> --- 57,61 ---- public IResultData ResultData { ! get { return (IResultData)_console; } } /// <summary> *************** *** 77,84 **** public DataTable Table { ! get { return m_table; } set { ! m_table = value; if(AutoRefresh) { --- 64,71 ---- public DataTable Table { ! get { return _table; } set { ! _table = value; if(AutoRefresh) { *************** *** 97,105 **** get { ! return m_AutoRefresh; } set { ! m_AutoRefresh = value; } } --- 84,92 ---- get { ! return _autoRefresh; } set { ! _autoRefresh = value; } } *************** *** 129,133 **** public override void OnResultShow() { ! m_Console = m_Snapin.ResultViewConsole; // setup the header for the columns we want to show --- 116,120 ---- public override void OnResultShow() { ! _console = Snapin.ResultViewConsole; // setup the header for the columns we want to show *************** *** 174,180 **** try { ! if (m_table != null) // Let's put in the column titles ! foreach (DataColumn col in m_table.Columns) { string name = col.Caption; --- 161,167 ---- try { ! if (this.Table != null) // Let's put in the column titles ! foreach (DataColumn col in this.Table.Columns) { string name = col.Caption; *************** *** 183,187 **** int nWidth = (int)ColumnHeaderWidth.AUTO_WIDTH; ! foreach(DataColumn prkey in m_table.PrimaryKey) if (col == prkey) nWidth = (int)ColumnHeaderWidth.HIDE_COLUMN; --- 170,174 ---- int nWidth = (int)ColumnHeaderWidth.AUTO_WIDTH; ! foreach(DataColumn prkey in this.Table.PrimaryKey) if (col == prkey) nWidth = (int)ColumnHeaderWidth.HIDE_COLUMN; *************** *** 208,214 **** /// </summary> /// <param name="ResultData"></param> ! public virtual void OnShowData(IResultData ResultData) { ! if (m_table != null) { int nRow = 1; --- 195,201 ---- /// </summary> /// <param name="ResultData"></param> ! public virtual void OnShowData(IResultData resultData) { ! if (this.Table != null) { int nRow = 1; *************** *** 216,220 **** Table.AcceptChanges(); ! foreach (DataRow row in m_table.Rows) { // MAM: check if the item should be added based on the filtering. --- 203,207 ---- Table.AcceptChanges(); ! foreach (DataRow row in this.Table.Rows) { // MAM: check if the item should be added based on the filtering. *************** *** 310,314 **** /// <param name="ResultDataItem"></param> /// <param name="pItemID"></param> ! public virtual void GetItem(out RESULTDATAITEM ResultDataItem, uint pItemID) { RESULTDATAITEM rdi = new RESULTDATAITEM(); --- 297,301 ---- /// <param name="ResultDataItem"></param> /// <param name="pItemID"></param> ! public virtual void GetItem(out RESULTDATAITEM resultDataItem, uint pItemID) { RESULTDATAITEM rdi = new RESULTDATAITEM(); *************** *** 320,324 **** ResultData.GetItem(ref rdi); ! ResultDataItem = rdi; } --- 307,311 ---- ResultData.GetItem(ref rdi); ! resultDataItem = rdi; } *************** *** 418,422 **** public virtual int GetItemLParam(int nRow) { ! return m_iCookie | (nRow << 16); } #endregion --- 405,409 ---- public virtual int GetItemLParam(int nRow) { ! return this.Cookie | (nRow << 16); } #endregion *************** *** 497,501 **** { case MMC_FILTER_CHANGE_CODE.MFCC_DISABLE: ! this.m_filters = null; break; --- 484,488 ---- { case MMC_FILTER_CHANGE_CODE.MFCC_DISABLE: ! this._filters = null; break; *************** *** 511,517 **** // Get the column object and set the string ! if(this.m_filters == null) { ! this.m_filters = new Hashtable(); } --- 498,504 ---- // Get the column object and set the string ! if(this._filters == null) { ! this._filters = new Hashtable(); } *************** *** 523,537 **** if (!Regex.IsMatch(strData, @"\w") || strData.Length >= (bufLen / 2)) { ! this.m_filters.Remove(col); } else { ! this.m_filters[col] = strData; } // Performance: unset the filter object when no filters are active. ! if(this.m_filters.Count == 0) { ! this.m_filters = null; } --- 510,524 ---- if (!Regex.IsMatch(strData, @"\w") || strData.Length >= (bufLen / 2)) { ! this._filters.Remove(col); } else { ! this._filters[col] = strData; } // Performance: unset the filter object when no filters are active. ! if(this._filters.Count == 0) { ! this._filters = null; } *************** *** 595,599 **** { // Performance: No filters: return early. ! if(m_filters == null) { return true; --- 582,586 ---- { // Performance: No filters: return early. ! if(_filters == null) { return true; *************** *** 603,607 **** for(int i=0; i<data.Length; i++) { ! string filterValue = m_filters[i] as string; if(filterValue != null && data[i] != null) { --- 590,594 ---- for(int i=0; i<data.Length; i++) { ! string filterValue = _filters[i] as string; if(filterValue != null && data[i] != null) { Index: OCXNode.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/OCXNode.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OCXNode.cs 22 Jul 2004 14:07:04 -0000 1.3 --- OCXNode.cs 19 Jan 2005 23:02:46 -0000 1.4 *************** *** 15,19 **** /// The guid for the ActivX Control /// </summary> ! protected Guid m_guidOCX; /// <summary> --- 15,19 ---- /// The guid for the ActivX Control /// </summary> ! private Guid _guidOCX; /// <summary> *************** *** 21,25 **** /// of this type or reuse the existing one /// </summary> ! protected bool m_bCreateNew; /// <summary> --- 21,25 ---- /// of this type or reuse the existing one /// </summary> ! private bool _bCreateNew; /// <summary> *************** *** 28,33 **** public virtual Guid OCXGuid { ! get { return m_guidOCX; } ! set { m_guidOCX = value; } } --- 28,33 ---- public virtual Guid OCXGuid { ! get { return _guidOCX; } ! set { _guidOCX = value; } } *************** *** 38,43 **** public virtual bool CreateNew { ! get { return m_bCreateNew; } ! set { m_bCreateNew = value; } } --- 38,43 ---- public virtual bool CreateNew { ! get { return _bCreateNew; } ! set { _bCreateNew = value; } } *************** *** 48,52 **** public OCXNode(SnapinBase snapin) : base(snapin) { ! m_bCreateNew = false; } --- 48,52 ---- public OCXNode(SnapinBase snapin) : base(snapin) { ! this.CreateNew = false; } Index: FormNode.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/FormNode.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FormNode.cs 22 Jul 2004 14:07:04 -0000 1.2 --- FormNode.cs 19 Jan 2005 23:02:46 -0000 1.3 *************** *** 23,34 **** // #region ! /// <summary> ! /// The Type of the UserControl to create ! /// </summary> ! protected Type m_ControlType; ! /// <summary> ! /// The usercontrol ! /// </summary> ! protected object m_usercontrol; #endregion --- 23,28 ---- // #region ! private Type _controlType; ! private object _usercontrol; #endregion *************** *** 43,54 **** public virtual Type ControlType { ! get { return m_ControlType; } ! set { m_ControlType = value; } } public virtual object UserControl { ! get { return m_usercontrol; } ! set { m_usercontrol = value; } } #endregion --- 37,48 ---- public virtual Type ControlType { ! get { return _controlType; } ! set { _controlType = value; } } public virtual object UserControl { ! get { return _usercontrol; } ! set { _usercontrol = value; } } #endregion *************** *** 113,133 **** // the OCX must implement this because its our shim control IMMCFormsShim shim = objOCX as IMMCFormsShim; ! if (shim == null || ControlType == null) return false; // get the type information from reflection ! Assembly asm = Assembly.GetAssembly(m_ControlType); // create the user control in the OCX ! System.IntPtr pUnk = shim.HostUserControl(asm.FullName, m_ControlType.ToString()); // marshal the usercontrol reference back up through the shim // and store as UserControl property ! m_usercontrol = Marshal.GetObjectForIUnknown(pUnk); // check if the usercontrol implements ISnapinLink // if so provide a back reference to the base snapin. ! ISnapinLink snapinLink = m_usercontrol as ISnapinLink; if(snapinLink != null) snapinLink.ContextNode = this; --- 107,127 ---- // the OCX must implement this because its our shim control IMMCFormsShim shim = objOCX as IMMCFormsShim; ! if (shim == null || ControlType == null) return false; // get the type information from reflection ! Assembly asm = Assembly.GetAssembly(this.ControlType); // create the user control in the OCX ! System.IntPtr pUnk = shim.HostUserControl(asm.FullName, this.ControlType.ToString()); // marshal the usercontrol reference back up through the shim // and store as UserControl property ! this.UserControl = Marshal.GetObjectForIUnknown(pUnk); // check if the usercontrol implements ISnapinLink // if so provide a back reference to the base snapin. ! ISnapinLink snapinLink = this.UserControl as ISnapinLink; if(snapinLink != null) snapinLink.ContextNode = this; Index: HTMLNode.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/HTMLNode.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** HTMLNode.cs 22 Jul 2004 14:07:04 -0000 1.3 --- HTMLNode.cs 19 Jan 2005 23:02:46 -0000 1.4 *************** *** 10,17 **** public class HTMLNode : BaseNode, IMMCSaneNode { ! /// <summary> ! /// The Url to navigate to on startup. ! /// </summary> ! protected string m_strUrl; /// <summary> --- 10,14 ---- public class HTMLNode : BaseNode, IMMCSaneNode { ! private string _strUrl; /// <summary> *************** *** 20,25 **** public string Url { ! get { return m_strUrl; } ! set { m_strUrl = value; } } --- 17,22 ---- public string Url { ! get { return _strUrl; } ! set { _strUrl = value; } } *************** *** 30,34 **** public HTMLNode(SnapinBase snapin) : base(snapin) { ! m_strUrl = "about:blank"; } --- 27,31 ---- public HTMLNode(SnapinBase snapin) : base(snapin) { ! this.Url = "about:blank"; } *************** *** 40,44 **** public HTMLNode(SnapinBase snapin, String displayName, String url) : base(snapin, displayName) { ! m_strUrl = url; } --- 37,41 ---- public HTMLNode(SnapinBase snapin, String displayName, String url) : base(snapin, displayName) { ! this.Url = url; } *************** *** 50,54 **** public HTMLNode(SnapinBase snapin, String displayName, String url, String ico1, String ico2) : base(snapin, displayName, ico1,ico2) { ! m_strUrl = url; } --- 47,51 ---- public HTMLNode(SnapinBase snapin, String displayName, String url, String ico1, String ico2) : base(snapin, displayName, ico1,ico2) { ! this.Url = url; } Index: FolderNode.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/FolderNode.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FolderNode.cs 1 Sep 2004 13:00:02 -0000 1.3 --- FolderNode.cs 19 Jan 2005 23:02:46 -0000 1.4 *************** *** 14,23 **** public class FolderNode : BaseNode, IMMCSaneNode { ! protected string path; ! protected ArrayList Files = new ArrayList(); public FolderNode(SnapinBase snapin, string path) : base(snapin) { ! this.path = path; CreateChildFiles(path); } --- 14,32 ---- public class FolderNode : BaseNode, IMMCSaneNode { ! private string _path; ! private ArrayList _files = new ArrayList(); ! ! /// <summary> ! /// Get/set the path ! /// </summary> ! public string Path ! { ! set{_path = value;} ! get{return _path;} ! } public FolderNode(SnapinBase snapin, string path) : base(snapin) { ! this.Path = path; CreateChildFiles(path); } *************** *** 36,40 **** file.DisplayName = fileInfo.Name; ! Files.Add(file); } } --- 45,49 ---- file.DisplayName = fileInfo.Name; ! _files.Add(file); } } *************** *** 67,71 **** try { ! header.InsertColumn(0, "Name", (int)ColumnHeaderFormat.LEFT, 250); } catch(COMException e) --- 76,80 ---- try { ! header.InsertColumn(0, SnapinBase.Translate("Name"), (int)ColumnHeaderFormat.LEFT, 250); } catch(COMException e) *************** *** 87,96 **** /// in the right pane, for the respective node item selected in the left pane. /// </summary> ! public virtual void OnShowData(IResultData ResultData) { int nRow = 1; RESULTDATAITEM rdi = new RESULTDATAITEM(); ! foreach (FileNode node in Files) { node.ToString(); --- 96,105 ---- /// in the right pane, for the respective node item selected in the left pane. /// </summary> ! public virtual void OnShowData(IResultData resultData) { int nRow = 1; RESULTDATAITEM rdi = new RESULTDATAITEM(); ! foreach (FileNode node in _files) { node.ToString(); *************** *** 102,106 **** rdi.lParam = node.Cookie | (nRow << 16); ! ResultData.InsertItem(ref rdi); nRow++; } --- 111,115 ---- rdi.lParam = node.Cookie | (nRow << 16); ! resultData.InsertItem(ref rdi); nRow++; } *************** *** 111,115 **** public class FileNode : BaseNode { ! protected FolderNode parentFolder = null; public FileNode(SnapinBase snapin) : base(snapin) --- 120,124 ---- public class FileNode : BaseNode { ! private FolderNode _parentFolder = null; public FileNode(SnapinBase snapin) : base(snapin) *************** *** 120,141 **** public FileNode(SnapinBase snapin, FolderNode parFolder) : base(snapin) { ! parentFolder = parFolder; } ! public override void GetDisplayInfo(ref RESULTDATAITEM ResultDataItem) { bool bCallbase = true; ! int nRow = (ResultDataItem.lParam >> 16) - 1; ! int nCol = ResultDataItem.nCol; ! if ((ResultDataItem.mask & (uint)RDI.STR) > 0) { string data = DisplayName; ! ResultDataItem.str = Marshal.StringToCoTaskMemUni(data); } ! if ((ResultDataItem.mask & (uint)RDI.IMAGE) > 0) { int offset = LargeImageIndex; --- 129,150 ---- public FileNode(SnapinBase snapin, FolderNode parFolder) : base(snapin) { ! _parentFolder = parFolder; } ! public override void GetDisplayInfo(ref RESULTDATAITEM resultDataItem) { bool bCallbase = true; ! int nRow = (resultDataItem.lParam >> 16) - 1; ! int nCol = resultDataItem.nCol; ! if ((resultDataItem.mask & (uint)RDI.STR) > 0) { string data = DisplayName; ! resultDataItem.str = Marshal.StringToCoTaskMemUni(data); } ! if ((resultDataItem.mask & (uint)RDI.IMAGE) > 0) { int offset = LargeImageIndex; *************** *** 143,151 **** offset = SmallImageIndex; ! ResultDataItem.nImage = (parentFolder.Cookie << 16) + offset; } if (bCallbase) ! base.GetDisplayInfo(ref ResultDataItem); } } --- 152,160 ---- offset = SmallImageIndex; ! resultDataItem.nImage = (_parentFolder.Cookie << 16) + offset; } if (bCallbase) ! base.GetDisplayInfo(ref resultDataItem); } } |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-19 22:58:51
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3362 Modified Files: BaseNode.cs Log Message: Changed a lot of protected variables that where storage for properties to private Added i18n support moved 'ShowModalPropertyPages' to PropertyPageSettings.cs Method parameter names should use a camel case for their names Index: BaseNode.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/BaseNode.cs,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** BaseNode.cs 5 Dec 2004 15:47:16 -0000 1.28 --- BaseNode.cs 19 Jan 2005 22:58:40 -0000 1.29 *************** *** 7,11 **** using System.Runtime.InteropServices; using System.Threading; - using Ironring.MMC.Core; using Ironring.MMC.Nodes.NodeEvents; --- 7,10 ---- *************** *** 22,111 **** /////////////////////////////////////////////////////////////////////// // [...2196 lines suppressed...] } --- 2085,2090 ---- public void RemovePropertySheet( ) { ! if( this._propSheet != null && !_propSheet.isClosed ) ! _propSheet.Invoke( _propSheet.CloseHandle, new object[]{ string.Empty, this } ); } *************** *** 2224,2227 **** ! } } --- 2121,2124 ---- ! } } |
|
From: Lesley v. Z. <ex...@us...> - 2005-01-19 22:52:36
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/Core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1732 Modified Files: SnapReg.cs Log Message: added class access internal to the classes (default, but this is more clear imo) Index: SnapReg.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Core/SnapReg.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SnapReg.cs 8 Jul 2004 13:27:15 -0000 1.2 --- SnapReg.cs 19 Jan 2005 22:52:08 -0000 1.3 *************** *** 8,12 **** namespace Ironring.MMC.Core { ! class SnapinRegistrar { public static void Register() --- 8,12 ---- namespace Ironring.MMC.Core { ! internal class SnapinRegistrar { public static void Register() *************** *** 36,40 **** } ! class SnapinRegInfo { public SnapinRegInfo() --- 36,40 ---- } ! internal class SnapinRegInfo { public SnapinRegInfo() *************** *** 49,53 **** ! class SnapinAboutRegistration { public SnapinAboutRegistration() --- 49,53 ---- ! internal class SnapinAboutRegistration { public SnapinAboutRegistration() *************** *** 62,66 **** /// Summary description for SnapReg /// </summary> ! class SnapReg { ArrayList fSnapinRegInfos = new ArrayList(); --- 62,66 ---- /// Summary description for SnapReg /// </summary> ! internal class SnapReg { ArrayList fSnapinRegInfos = new ArrayList(); |
