dynamic fonts' options translation

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

3 files changed, 6 insertions, 6 deletions

diff --git a/plugins/Popup/src/font.cpp b/plugins/Popup/src/font.cpp
index d9502eadac..77aca7b94a 100644
--- a/plugins/Popup/src/font.cpp
+++ b/plugins/Popup/src/font.cpp
@@ -85,12 +85,12 @@ void InitFonts() {
 	lstrcpy(cid.name, _T(PU_COL_BACK_NAME));

 	strcpy(cid.setting, PU_COL_BACK_SETTING);

 	cid.defcolour = SETTING_BACKCOLOUR_DEFAULT;

-	CallService(MS_COLOUR_REGISTERT, (WPARAM)&cid, 0);

+	ColourRegisterT(&cid);

 

 	lstrcpy(cid.name, _T(PU_COL_AVAT_NAME));

 	strcpy(cid.setting, PU_COL_AVAT_SETTING);

 	cid.defcolour = SETTING_TEXTCOLOUR_DEFAULT;

-	CallService(MS_COLOUR_REGISTERT, (WPARAM)&cid, 0);

+	ColourRegisterT(&cid);

 

 	ReloadFonts();

 }

diff --git a/plugins/Popup/src/notifications.cpp b/plugins/Popup/src/notifications.cpp
index 3a8beb8f15..bed6cdc116 100644
--- a/plugins/Popup/src/notifications.cpp
+++ b/plugins/Popup/src/notifications.cpp
@@ -213,7 +213,7 @@ HANDLE RegisterNotification(POPUPNOTIFICATION *notification)
 	mir_snprintf(fontid.name, SIZEOF(fontid.name), "%s (colors only)", notification->lpzName);

 	mir_snprintf(fontid.prefix, SIZEOF(fontid.prefix), "{%s/%s}text", notification->lpzGroup, notification->lpzName);

 	fontid.deffontsettings.style = 0;

-	CallService(MS_FONT_REGISTER, (WPARAM)&fontid, 0);

+	FontRegister(&fontid);

 

 	ColourID colourid = {0};

 	colourid.cbSize = sizeof(colourid);

@@ -222,7 +222,7 @@ HANDLE RegisterNotification(POPUPNOTIFICATION *notification)
 	mir_snprintf(colourid.name, SIZEOF(colourid.name), "%s (colors only)", notification->lpzName);

 	mir_snprintf(colourid.setting, SIZEOF(colourid.setting), "{%s/%s}backColor", notification->lpzGroup, notification->lpzName);

 	colourid.defcolour = ptd->notification.colorBack;

-	CallService(MS_COLOUR_REGISTER, (WPARAM)&colourid, 0);

+	ColourRegister(&colourid);

 

 	char section[MAXMODULELABELLENGTH], setting[MAXMODULELABELLENGTH];

 	mir_snprintf(section, sizeof(section), "PopUps/%s", notification->lpzGroup);

diff --git a/plugins/Popup/src/services.cpp b/plugins/Popup/src/services.cpp
index ca1c700781..3246a2fbcd 100644
--- a/plugins/Popup/src/services.cpp
+++ b/plugins/Popup/src/services.cpp
@@ -612,7 +612,7 @@ INT_PTR PopUp_RegisterPopupClass(WPARAM wParam, LPARAM lParam) {
 	mir_snprintf(fid.prefix, sizeof(fid.prefix), "%s/Text", ptd->pupClass.pszName);  // result is "%s/TextCol"

 	fid.deffontsettings.style  = 0;

 	fid.deffontsettings.colour = fonts.clText;

-	CallService(MS_FONT_REGISTER, (WPARAM)&fid, 0);

+	FontRegister(&fid);

 

 	//we ignore pc->colorBack and use fonts.clBack as default (if no setting found in DB)

 	mir_snprintf(setting, 256, "%s/BgCol", ptd->pupClass.pszName);

@@ -624,7 +624,7 @@ INT_PTR PopUp_RegisterPopupClass(WPARAM wParam, LPARAM lParam) {
 	strcpy(cid.name, PU_COL_BACK_NAME);

 	mir_snprintf(cid.setting, sizeof(cid.setting), "%s/BgCol", ptd->pupClass.pszName);

 	cid.defcolour = fonts.clBack;

-	CallService(MS_COLOUR_REGISTER, (WPARAM)&cid, 0);

+	ColourRegister(&cid);

 

 	gTreeData.insert(ptd);

 	num_classes++;