- PLUGININFO structure removed at all;

- Options_AddPage & UserInfo_AddPage replaced MS_OPT_ADDPAGE & MS_USERINFO_ADDPAGE services respectively
- total internal redesign of options' translation
- code reformatting

git-svn-id: http://svn.miranda-ng.org/main/trunk@477 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 8 insertions, 8 deletions

diff --git a/plugins/Clist_modern/modern_clcopts.cpp b/plugins/Clist_modern/modern_clcopts.cpp
index 91b3f15bf8..1fcf7dbb0b 100644
--- a/plugins/Clist_modern/modern_clcopts.cpp
+++ b/plugins/Clist_modern/modern_clcopts.cpp
@@ -286,7 +286,7 @@ int ClcOptInit(WPARAM wParam,LPARAM lParam)
 	odp.ptszTitle=LPGENT("Contact List");

 	odp.pfnDlgProc=DlgProcClistListOpts;

 	odp.flags=ODPF_BOLDGROUPS|ODPF_TCHAR;

-	//CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);  

+	//Options_AddPage(wParam,&odp);  

 	{

 		int i;	

 		for (i=0; clist_opt_items[i].id!=0; i++)

@@ -297,7 +297,7 @@ int ClcOptInit(WPARAM wParam,LPARAM lParam)
 			odp.flags=ODPF_BOLDGROUPS|ODPF_TCHAR|clist_opt_items[i].flag;

 			odp.expertOnlyControls = clist_opt_items[i].expertControls;

 			odp.nExpertOnlyControls = clist_opt_items[i].nExpertControls;

-			CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);

+			Options_AddPage(wParam,&odp);

 		}

 	}

 

@@ -309,7 +309,7 @@ int ClcOptInit(WPARAM wParam,LPARAM lParam)
 		odp.ptszTab  = LPGENT("List Background");

 		odp.pfnDlgProc = DlgProcClcBkgOpts;

 		odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR;

-		CallService(MS_OPT_ADDPAGE, wParam, (LPARAM) & odp);

+		Options_AddPage(wParam, &odp);

 	}

 	

 	return 0;

diff --git a/plugins/Clist_modern/modern_clistopts.cpp b/plugins/Clist_modern/modern_clistopts.cpp
index 07092018a0..73c7c8c7e7 100644
--- a/plugins/Clist_modern/modern_clistopts.cpp
+++ b/plugins/Clist_modern/modern_clistopts.cpp
@@ -72,7 +72,7 @@ int CListOptInit(WPARAM wParam,LPARAM lParam)
 	odp.ptszGroup=LPGENT("Contact List");

 	odp.ptszTitle=LPGENT("Row items");

 	odp.flags=ODPF_BOLDGROUPS|ODPF_TCHAR;

-	//	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);

+	//	Options_AddPage(wParam,&odp);

 

 	{

 		BOOL hasExtraIconsService = ServiceExists("ExtraIcon/Register");

@@ -85,7 +85,7 @@ int CListOptInit(WPARAM wParam,LPARAM lParam)
 			odp.pszTemplate=MAKEINTRESOURCEA(row_opt_items[i].id);

 			odp.ptszTab=row_opt_items[i].name;

 			odp.pfnDlgProc=row_opt_items[i].wnd_proc;

-			CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);

+			Options_AddPage(wParam,&odp);

 		}

 	}

 

diff --git a/plugins/Clist_modern/modern_skinopt.cpp b/plugins/Clist_modern/modern_skinopt.cpp
index adbbc6a895..021691db9f 100644
--- a/plugins/Clist_modern/modern_skinopt.cpp
+++ b/plugins/Clist_modern/modern_skinopt.cpp
@@ -65,7 +65,7 @@ int SkinOptInit( WPARAM wParam, LPARAM lParam )
 		odp.ptszTitle = LPGENT( "Contact List" );

 		odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR;

 		odp.ptszTab = LPGENT( "Load/Save" );

-		CallService( MS_OPT_ADDPAGE, wParam, ( LPARAM )&odp );

+		Options_AddPage(wParam, &odp);

 

 		if ( ModernGetSettingByte( NULL, "ModernData", "EnableSkinEditor", SETTING_ENABLESKINEDITOR_DEFAULT ) )

 		{

@@ -73,7 +73,7 @@ int SkinOptInit( WPARAM wParam, LPARAM lParam )
 			odp.pfnDlgProc = DlgSkinEditorOpts;

 			odp.pszTemplate = MAKEINTRESOURCEA( IDD_OPT_SKINEDITOR );

 			odp.ptszTab = LPGENT( "Object Editor" );

-			CallService( MS_OPT_ADDPAGE, wParam, ( LPARAM )&odp );

+			Options_AddPage(wParam, &odp);

 		}

 	}

 	return 0;

diff --git a/plugins/Clist_modern/modern_toolbar.cpp b/plugins/Clist_modern/modern_toolbar.cpp
index 2c59d750f0..0c3e9e868b 100644
--- a/plugins/Clist_modern/modern_toolbar.cpp
+++ b/plugins/Clist_modern/modern_toolbar.cpp
@@ -298,7 +298,7 @@ static int	  ehhToolbarOptInit(WPARAM wParam, LPARAM lParam)
 	odp.ptszTitle=LPGENT("ToolBar");

 	odp.pfnDlgProc=(DLGPROC)ToolBar_OptDlgProc;

 	odp.flags=ODPF_BOLDGROUPS|ODPF_TCHAR;

-	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); 

+	Options_AddPage(wParam,&odp); 

 	return 0;

 }

 static INT_PTR    svcToolBarAddButton(WPARAM wParam, LPARAM lParam)