MyDetails: Set main menu icon. (fixes #305)

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

2 files changed, 14 insertions, 8 deletions

diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp
index a040de6e63..666548fd73 100644
--- a/plugins/MyDetails/src/frame.cpp
+++ b/plugins/MyDetails/src/frame.cpp
@@ -335,7 +335,7 @@ int CreateFrame()
 		mi.popupPosition = -0x7FFFFFFF;

 		mi.ptszPopupName = LPGENT("My Details");

 		mi.position = 1; // 500010000

-		mi.hIcon = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

+		mi.hIcon = LoadSkinnedIcon(SKINICON_OTHER_USERDETAILS);

 		mi.ptszName = LPGENT("Show My Details");

 		mi.pszService= MODULE_NAME "/ShowHideMyDetails";

 		hMenuShowHideFrame = Menu_AddMainMenuItem(&mi);

diff --git a/plugins/MyDetails/src/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp
index 9551211069..359fb286c9 100644
--- a/plugins/MyDetails/src/mydetails.cpp
+++ b/plugins/MyDetails/src/mydetails.cpp
@@ -583,34 +583,40 @@ static int MainInit(WPARAM wparam,LPARAM lparam)
 

 	// Add options to menu

 	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.cbSize = sizeof(mi);

 	mi.popupPosition = 500050000;

+	mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR;

+	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_USERDETAILS);

+	mi.ptszName = LPGENT("My Details");

+	HANDLE hMenuRoot = Menu_AddMainMenuItem(&mi);

+

+	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR;

+	mi.ptszPopupName = (TCHAR *)hMenuRoot;

+	mi.popupPosition = 0;

+	mi.icolibItem = NULL;

 

 	if (protocols->CanSetAvatars()) {

-		mi.pszPopupName = LPGEN("My Details");

 		mi.position = 100001;

-		mi.pszName = LPGEN("Set My Avatar...");

+		mi.ptszName = LPGENT("Set My Avatar...");

 		CreateServiceFunction("MENU_" MS_MYDETAILS_SETMYAVATARUI, Menu_SetMyAvatarUI);

 		mi.pszService = "MENU_" MS_MYDETAILS_SETMYAVATARUI;

 		Menu_AddMainMenuItem(&mi);

 	}

 

-	mi.pszPopupName = LPGEN("My Details");

 	mi.position = 100002;

-	mi.pszName = LPGEN("Set My Nickname...");

+	mi.ptszName = LPGENT("Set My Nickname...");

 	CreateServiceFunction("MENU_" MS_MYDETAILS_SETMYNICKNAMEUI, Menu_SetMyNicknameUI);

 	mi.pszService = "MENU_" MS_MYDETAILS_SETMYNICKNAMEUI;

 	Menu_AddMainMenuItem(&mi);

 

 	mi.position = 100003;

-	mi.pszName = LPGEN("Set My Status Message...");

+	mi.ptszName = LPGENT("Set My Status Message...");

 	CreateServiceFunction("MENU_" MS_MYDETAILS_SETMYSTATUSMESSAGEUI, Menu_SetMyStatusMessageUI);

 	mi.pszService = "MENU_" MS_MYDETAILS_SETMYSTATUSMESSAGEUI;

 	Menu_AddMainMenuItem(&mi);

 

 	// Set protocols to show frame

 	mi.position = 200001;

-	mi.pszName = LPGEN("Show next protocol");

+	mi.ptszName = LPGENT("Show next protocol");

 	mi.pszService = MS_MYDETAILS_SHOWNEXTPROTOCOL;

 	Menu_AddMainMenuItem(&mi);