revert hooking options pages creation removed in rev 2613

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

2 files changed, 12 insertions, 11 deletions

diff --git a/plugins/YAPP/src/options.cpp b/plugins/YAPP/src/options.cpp
index 298e80bcc5..186e841f75 100644
--- a/plugins/YAPP/src/options.cpp
+++ b/plugins/YAPP/src/options.cpp
@@ -164,19 +164,18 @@ static INT_PTR CALLBACK DlgProcOpts1(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 

 			SendMessage(hwndList,LVM_SETEXTENDEDLISTVIEWSTYLE, 0,LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES);

 

-			LVCOLUMN lvc = {0}; 

+			LVCOLUMN lvc = {0};

 			// Initialize the LVCOLUMN structure.

 			// The mask specifies that the format, width, text, and

 			// subitem members of the structure are valid. 

-			lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; 

+			lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;

 			lvc.fmt = LVCFMT_LEFT;

-	  

+

 			lvc.iSubItem = 0;

 			lvc.pszText = TranslateT("Status");	

 			lvc.cx = 200;     // width of column in pixels

 			ListView_InsertColumn(hwndList, 0, &lvc);

 

-

 			LVITEM lvI = {0};

 

 			// Some code to create the list-view control.

@@ -256,7 +255,7 @@ static INT_PTR CALLBACK DlgProcOpts1(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 

 		CheckDlgButton(hwndDlg, IDC_CHK_ANIMATE, options.animate);

 		CheckDlgButton(hwndDlg, IDC_CHK_TRANSBG, options.trans_bg);

-		return FALSE;		

+		return FALSE;

 

 	case WM_COMMAND:

 		if ( HIWORD( wParam ) == CBN_SELCHANGE)

@@ -323,9 +322,9 @@ static INT_PTR CALLBACK DlgProcOpts1(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			options.right_icon = (SendDlgItemMessage(hwndDlg, IDC_CMB_ICON, CB_GETCURSEL, 0, 0) == 1);

 			options.av_layout = (PopupAvLayout)SendDlgItemMessage(hwndDlg, IDC_CMB_AV, CB_GETCURSEL, 0, 0);

 			options.time_layout = (PopupTimeLayout)SendDlgItemMessage(hwndDlg, IDC_CMB_TIME, CB_GETCURSEL, 0, 0);

-			

+

 			new_val = GetDlgItemInt(hwndDlg, IDC_ED_TRANS, &trans, FALSE);

-			if (trans) options.opacity = new_val;			

+			if (trans) options.opacity = new_val;

 			options.border = IsDlgButtonChecked(hwndDlg, IDC_CHK_BORDER) && IsWindowEnabled(GetDlgItem(hwndDlg, IDC_CHK_BORDER)) ? true : false;

 			options.round = IsDlgButtonChecked(hwndDlg, IDC_CHK_ROUNDCORNERS) && IsWindowEnabled(GetDlgItem(hwndDlg, IDC_CHK_ROUNDCORNERS))  ? true : false;

 			options.av_round = IsDlgButtonChecked(hwndDlg, IDC_CHK_ROUNDCORNERSAV) && IsWindowEnabled(GetDlgItem(hwndDlg, IDC_CHK_ROUNDCORNERSAV))  ? true : false;

@@ -492,6 +491,8 @@ int OptInit(WPARAM wParam, LPARAM lParam)
 

 void InitOptions()

 {

+	HookEvent(ME_OPT_INITIALISE, OptInit);

+

 	// an icon for preview popups

 	hPopupIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE);

 	LoadOptions();

diff --git a/plugins/YAPP/src/yapp.cpp b/plugins/YAPP/src/yapp.cpp
index 985d2b6287..9b94400299 100644
--- a/plugins/YAPP/src/yapp.cpp
+++ b/plugins/YAPP/src/yapp.cpp
@@ -44,7 +44,7 @@ extern "C" BOOL APIENTRY DllMain( HMODULE hModule, DWORD  ul_reason_for_call, LP
 {

 	hInst = hModule;

 	DisableThreadLibraryCalls(hInst);

-    return TRUE;

+	return TRUE;

 }

 

 extern "C" YAPP_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

@@ -108,7 +108,7 @@ static void InitFonts()
 	_tcscpy(font_id_time.backgroundName, _T("Background"));

 	font_id_time.order = 2;

 	FontRegisterT(&font_id_time);

-		

+

 	colour_id_bg.cbSize = sizeof(ColourIDT);

 	_tcscpy(colour_id_bg.group, LPGENT("Popups"));

 	_tcscpy(colour_id_bg.name, LPGENT("Background"));

@@ -144,7 +144,7 @@ static void InitFonts()
 	colour_id_titleunderline.defcolour = GetSysColor(COLOR_3DSHADOW);

 	colour_id_titleunderline.order = 3;

 	ColourRegisterT(&colour_id_titleunderline);

-		

+

 	ReloadFont(0, 0);

 }

 

@@ -156,7 +156,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 		lstPopupHistory.SetRenderer(RENDER_HISTORYPP);

 

 	HookEvent(ME_FONT_RELOAD, ReloadFont);

-	

+

 	LoadModuleDependentOptions(); 

 

 	if (GetModuleHandle(_T("neweventnotify")))