fixes #1448 (translated frame names in database)

4 files changed, 26 insertions, 29 deletions

diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp
index 715fab58d4..66b3c225bf 100644
--- a/plugins/Clist_nicer/src/clistevents.cpp
+++ b/plugins/Clist_nicer/src/clistevents.cpp
@@ -42,7 +42,7 @@ struct CListImlIcon
 

 static int iconsOn;

 

-HANDLE hNotifyFrame = (HANDLE)-1;

+int hNotifyFrame = -1;

 

 void HideShowNotifyFrame()

 {

@@ -56,11 +56,11 @@ void HideShowNotifyFrame()
 

 	if (desired) {

 		if (!dwVisible)

-			CallService(MS_CLIST_FRAMES_SHFRAME, (WPARAM)hNotifyFrame, 0);

+			CallService(MS_CLIST_FRAMES_SHFRAME, hNotifyFrame, 0);

 	}

 	else {

 		if (dwVisible)

-			CallService(MS_CLIST_FRAMES_SHFRAME, (WPARAM)hNotifyFrame, 0);

+			CallService(MS_CLIST_FRAMES_SHFRAME, hNotifyFrame, 0);

 	}

 }

 

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index 4d08b64480..cf269c7bf4 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -41,7 +41,7 @@ static RECT rcWPC;
 static int transparentFocus = 1;
 static byte oldhideoffline;
 static int disableautoupd = 1;
-HANDLE hFrameContactTree;
+static int hFrameContactTree;
 extern RECT old_window_rect, new_window_rect;
 
 extern BOOL g_trayTooltipActive;
@@ -63,9 +63,8 @@ RECT cluiPos;
 wchar_t *statusNames[12];
 
 extern LRESULT CALLBACK EventAreaWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
-extern HANDLE hNotifyFrame;
+extern int hNotifyFrame;
 
-int LoadCluiServices(void);
 void MF_InitCheck(void);
 void InitGroupMenus();
 void FS_RegisterFonts();
@@ -181,16 +180,16 @@ static int CreateCLC()
 	{
 		CLISTFrame frame = { 0 };
 		frame.cbSize = sizeof(frame);
-		frame.tname = L"EventArea";
-		frame.TBtname = TranslateT("Event area");
+		frame.szName.a = "EventArea";
+		frame.szTBname.a = LPGEN("Event area");
 		frame.hIcon = Skin_LoadIcon(SKINICON_OTHER_FRAME);
 		frame.height = 20;
-		frame.Flags = F_VISIBLE | F_SHOWTBTIP | F_NOBORDER | F_UNICODE;
+		frame.Flags = F_VISIBLE | F_SHOWTBTIP | F_NOBORDER;
 		frame.align = alBottom;
 		frame.hWnd = CreateWindowExA(0, "EventAreaClass", "evt", WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20, g_clistApi.hwndContactList, (HMENU)nullptr, g_plugin.getInst(), nullptr);
 		g_hwndEventArea = frame.hWnd;
-		hNotifyFrame = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&frame, 0);
-		CallService(MS_CLIST_FRAMES_UPDATEFRAME, (WPARAM)hNotifyFrame, FU_FMPOS);
+		hNotifyFrame = g_plugin.addFrame(&frame);
+		CallService(MS_CLIST_FRAMES_UPDATEFRAME, hNotifyFrame, FU_FMPOS);
 		HideShowNotifyFrame();
 		CreateViewModeFrame();
 	}
@@ -200,11 +199,11 @@ static int CreateCLC()
 		Frame.hWnd = g_clistApi.hwndContactTree;
 		Frame.align = alClient;
 		Frame.hIcon = Skin_LoadIcon(SKINICON_OTHER_FRAME);
-		Frame.Flags = F_VISIBLE | F_SHOWTB | F_SHOWTBTIP | F_NOBORDER | F_UNICODE;
-		Frame.tname = L"My contacts";
-		Frame.TBtname = TranslateT("My contacts");
+		Frame.Flags = F_VISIBLE | F_SHOWTB | F_SHOWTBTIP | F_NOBORDER;
+		Frame.szName.a = "My contacts";
+		Frame.szTBname.a = LPGEN("My contacts");
 		Frame.height = 200;
-		hFrameContactTree = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&Frame, 0);
+		hFrameContactTree = g_plugin.addFrame(&Frame);
 		CallService(MS_CLIST_FRAMES_SETFRAMEOPTIONS, MAKEWPARAM(FO_TBTIPNAME | FO_UNICODETEXT, hFrameContactTree), (LPARAM)TranslateT("My contacts"));
 
 		// ugly, but working hack. Prevent that annoying little scroll bar from appearing in the "My Contacts" title bar
@@ -583,7 +582,7 @@ static void sttProcessResize(HWND hwnd, NMCLISTCONTROL *nmc)
 
 	if (Docking_IsDocked(0, 0))
 		return;
-	if (hFrameContactTree == nullptr)
+	if (hFrameContactTree == 0)
 		return;
 
 	maxHeight = db_get_b(NULL, "CLUI", "MaxSizeHeight", 75);
diff --git a/plugins/Clist_nicer/src/cluiframes.cpp b/plugins/Clist_nicer/src/cluiframes.cpp
index 5aefb329d5..502d2e8a06 100644
--- a/plugins/Clist_nicer/src/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/cluiframes.cpp
@@ -1577,18 +1577,18 @@ INT_PTR CLUIFramesAddFrame(WPARAM wParam, LPARAM)
 
 	Frames[nFramescount].dwFlags = clfrm->Flags;
 
-	if (clfrm->name == nullptr || ((clfrm->Flags&F_UNICODE) ? mir_wstrlen(clfrm->wname) : mir_strlen(clfrm->name)) == 0) {
+	if (clfrm->szName.a == nullptr || ((clfrm->Flags & F_UNICODE) ? mir_wstrlen(clfrm->szName.w) : mir_strlen(clfrm->szName.a)) == 0) {
 		wchar_t ptszClassName[256];
 		GetClassName(Frames[nFramescount].hWnd, ptszClassName, _countof(ptszClassName));
 		Frames[nFramescount].name = mir_wstrdup(ptszClassName);
 	}
-	else Frames[nFramescount].name = (clfrm->Flags & F_UNICODE) ? mir_wstrdup(clfrm->wname) : mir_a2u(clfrm->name);
+	else Frames[nFramescount].name = (clfrm->Flags & F_UNICODE) ? mir_wstrdup(clfrm->szName.w) : mir_a2u(clfrm->szName.a);
 
-	if (IsBadCodePtr((FARPROC)clfrm->TBname) || clfrm->TBname == nullptr
-		|| ((clfrm->Flags&F_UNICODE) ? mir_wstrlen(clfrm->TBwname) : mir_strlen(clfrm->TBname)) == 0)
+	if (IsBadCodePtr((FARPROC)clfrm->szTBname.a) || clfrm->szTBname.a == nullptr
+		|| ((clfrm->Flags & F_UNICODE) ? mir_wstrlen(clfrm->szTBname.w) : mir_strlen(clfrm->szTBname.a)) == 0)
 		Frames[nFramescount].TitleBar.tbname = mir_wstrdup(Frames[nFramescount].name);
 	else
-		Frames[nFramescount].TitleBar.tbname = (clfrm->Flags & F_UNICODE) ? mir_wstrdup(clfrm->TBwname) : mir_a2u(clfrm->TBname);
+		Frames[nFramescount].TitleBar.tbname = (clfrm->Flags & F_UNICODE) ? mir_wstrdup(clfrm->szTBname.w) : mir_a2u(clfrm->szTBname.a);
 	Frames[nFramescount].needhide = FALSE;
 	Frames[nFramescount].TitleBar.ShowTitleBar = (clfrm->Flags & F_SHOWTB ? TRUE : FALSE);
 	Frames[nFramescount].TitleBar.ShowTitleBarTip = (clfrm->Flags & F_SHOWTBTIP ? TRUE : FALSE);
diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp
index b5429d776b..35a700855d 100644
--- a/plugins/Clist_nicer/src/viewmodes.cpp
+++ b/plugins/Clist_nicer/src/viewmodes.cpp
@@ -984,7 +984,6 @@ clvm_config_command:
 	return TRUE;

 }

 

-static HWND hCLVMFrame;

 HWND g_hwndViewModeFrame;

 

 void CreateViewModeFrame()

@@ -1006,20 +1005,19 @@ void CreateViewModeFrame()
 

 	memset(&frame, 0, sizeof(frame));

 	frame.cbSize = sizeof(frame);

-	frame.tname = L"View modes";

-	frame.TBtname = TranslateT("View modes");

+	frame.szName.a = "View modes";

+	frame.szTBname.a = LPGEN("View modes");

 	frame.hIcon = Skin_LoadIcon(SKINICON_OTHER_FRAME);

 	frame.height = 22;

-	frame.Flags = F_VISIBLE | F_SHOWTBTIP | F_NOBORDER | F_UNICODE;

+	frame.Flags = F_VISIBLE | F_SHOWTBTIP | F_NOBORDER;

 	frame.align = alBottom;

 	frame.hWnd = CreateWindowEx(0, L"CLVMFrameWindow", L"CLVM", WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPCHILDREN, 0, 0, 20, 20, g_clistApi.hwndContactList, (HMENU)nullptr, g_plugin.getInst(), nullptr);

 	g_hwndViewModeFrame = frame.hWnd;

-	hCLVMFrame = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&frame, 0);

-	CallService(MS_CLIST_FRAMES_UPDATEFRAME, (WPARAM)hCLVMFrame, FU_FMPOS);

+	

+	int hCLVMFrame = g_plugin.addFrame(&frame);

+	CallService(MS_CLIST_FRAMES_UPDATEFRAME, hCLVMFrame, FU_FMPOS);

 }

 

-const char *MakeVariablesString(const char *src, const char *UIN);

-

 void ApplyViewMode(const char *name)

 {

 	cfg::dat.bFilterEffective = 0;