- 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

3 files changed, 17 insertions, 20 deletions

diff --git a/protocols/JabberG/jabber_opt.cpp b/protocols/JabberG/jabber_opt.cpp
index 230fdb8a5f..63c38d6d0c 100644
--- a/protocols/JabberG/jabber_opt.cpp
+++ b/protocols/JabberG/jabber_opt.cpp
@@ -1609,34 +1609,34 @@ int CJabberProto::OnOptionsInit( WPARAM wParam, LPARAM )
 	odp.cbSize      = sizeof( odp );

 	odp.hInstance   = hInst;

 	odp.ptszGroup   = LPGENT("Network");

-	odp.ptszTitle   = m_tszUserName;	// title!!!!!!!!!!!

-	odp.flags       = ODPF_BOLDGROUPS|ODPF_TCHAR|ODPF_DONTTRANSLATE;

+	odp.ptszTitle   = m_tszUserName;

+	odp.flags       = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE;

 

 	odp.ptszTab     = LPGENT("Account");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_JABBER);

 	odp.pfnDlgProc  = CDlgBase::DynamicDlgProc;

-	odp.dwInitParam	= (LPARAM)&OptCreateAccount;

+	odp.dwInitParam = (LPARAM)&OptCreateAccount;

 	OptCreateAccount.create = CDlgOptAccount::Create;

 	OptCreateAccount.param = this;

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

+	Options_AddPage(wParam, &odp);

 

 	odp.ptszTab     = LPGENT("Conferences");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_JABBER4);

 	odp.pfnDlgProc  = CDlgBase::DynamicDlgProc;

-	odp.dwInitParam	= (LPARAM)&OptCreateGc;

+	odp.dwInitParam = (LPARAM)&OptCreateGc;

 	OptCreateGc.create = CDlgOptGc::Create;

 	OptCreateGc.param = this;

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

+	Options_AddPage(wParam, &odp);

 

 	odp.flags |= ODPF_EXPERTONLY;

 

 	odp.ptszTab     = LPGENT("Advanced");

 	odp.pszTemplate = MAKEINTRESOURCEA( IDD_OPT_JABBER2 );

 	odp.pfnDlgProc  = CDlgBase::DynamicDlgProc;

-	odp.dwInitParam	= (LPARAM)&OptCreateAdvanced;

+	odp.dwInitParam = (LPARAM)&OptCreateAdvanced;

 	OptCreateAdvanced.create = CDlgOptAdvanced::Create;

 	OptCreateAdvanced.param = this;

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

+	Options_AddPage(wParam, &odp);

 

 	return 0;

 }

@@ -2074,8 +2074,7 @@ void CJabberDlgAccMgrUI::CheckRegistration()
 

 void CJabberDlgAccMgrUI::setupConnection(int type)

 {

-	switch (type)

-	{

+	switch (type) {

 		case ACC_PUBLIC: setupPublic(); break;

 		case ACC_TLS: setupSecure(); break;

 		case ACC_SSL: setupSecureSSL(); break;

@@ -2185,7 +2184,6 @@ void CJabberDlgAccMgrUI::setupFB()
 	m_txtManualHost.Disable();

 	m_txtPort.Disable();

 	m_btnRegister.Disable();

-//	m_cbResource.Disable();

 }

 

 void CJabberDlgAccMgrUI::setupVK()

@@ -2204,7 +2202,6 @@ void CJabberDlgAccMgrUI::setupVK()
 	m_txtManualHost.Disable();

 	m_txtPort.Disable();

 	m_btnRegister.Disable();

-//	m_cbResource.Disable();

 }

 

 void CJabberDlgAccMgrUI::setupSMS()

diff --git a/protocols/JabberG/jabber_userinfo.cpp b/protocols/JabberG/jabber_userinfo.cpp
index d80276361a..713b838262 100644
--- a/protocols/JabberG/jabber_userinfo.cpp
+++ b/protocols/JabberG/jabber_userinfo.cpp
@@ -864,13 +864,13 @@ int CJabberProto::OnUserInfoInit( WPARAM wParam, LPARAM lParam )
 			odp.position = -2000000000;

 			odp.pszTemplate = MAKEINTRESOURCEA( IDD_INFO_JABBER );

 			odp.pszTitle = LPGEN("Account");

-			JCallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp );

+			UserInfo_AddPage(wParam, &odp);

 

 			odp.pfnDlgProc = JabberUserPhotoDlgProc;

 			odp.position = 2000000000;

 			odp.pszTemplate = MAKEINTRESOURCEA( IDD_VCARD_PHOTO );

 			odp.pszTitle = LPGEN("Photo");

-			JCallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp );

+			UserInfo_AddPage(wParam, &odp);

 		}

 	} 

 	else {

diff --git a/protocols/JabberG/jabber_vcard.cpp b/protocols/JabberG/jabber_vcard.cpp
index 2ec8dcf3d7..470eac42c6 100644
--- a/protocols/JabberG/jabber_vcard.cpp
+++ b/protocols/JabberG/jabber_vcard.cpp
@@ -1223,32 +1223,32 @@ void CJabberProto::OnUserInfoInit_VCard( WPARAM wParam, LPARAM )
 	odp.pfnDlgProc = PersonalDlgProc;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_PERSONAL);

 	odp.ptszTab = LPGENT("General");

-	JCallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp );

+	UserInfo_AddPage(wParam, &odp);

 

 	odp.pfnDlgProc = ContactDlgProc;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_CONTACT);

 	odp.ptszTab = LPGENT("Contacts");

-	JCallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp );

+	UserInfo_AddPage(wParam, &odp);

 

 	odp.pfnDlgProc = HomeDlgProc;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_HOME);

 	odp.ptszTab = LPGENT("Home");

-	JCallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp );

+	UserInfo_AddPage(wParam, &odp);

 

 	odp.pfnDlgProc = WorkDlgProc;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_WORK);

 	odp.ptszTab = LPGENT("Work");

-	JCallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp );

+	UserInfo_AddPage(wParam, &odp);

 

 	odp.pfnDlgProc = PhotoDlgProc;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_PHOTO);

 	odp.ptszTab = LPGENT("Photo");

-	JCallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp );

+	UserInfo_AddPage(wParam, &odp);

 

 	odp.pfnDlgProc = NoteDlgProc;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_NOTE);

 	odp.ptszTab = LPGENT("Note");

-	JCallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp );

+	UserInfo_AddPage(wParam, &odp);

 

 	SendGetVcard( m_szJabberJID );

 }