GaduGadu:

- fixed menu icons


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

7 files changed, 15 insertions, 14 deletions

diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index 2019872ee3..9b7078f416 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -271,7 +271,7 @@ void GGPROTO::block_init()
 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.flags = CMIF_ICONFROMICOLIB;

 	mi.position = -500050000;

-	mi.icolibItem = GetIconHandle(IDI_BLOCK);

+	mi.icolibItem = iconList[8].hIcolib;

 	mi.pszName = LPGEN("&Block");

 	mi.pszService = service;

 	mi.pszContactOwner = m_szModuleName;

@@ -301,7 +301,7 @@ void GGPROTO::menus_init()
 		mi.position = 500090000;

 		mi.hParentMenu = HGENMENU_ROOT;

 		mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

-		mi.icolibItem = GetIconHandle(IDI_GG);

+		mi.icolibItem = iconList[0].hIcolib;

 		hGCRoot = hCLRoot = hRoot = hMenuRoot = Menu_AddProtoMenuItem(&mi);

 	}

 	else {

@@ -310,12 +310,12 @@ void GGPROTO::menus_init()
 

 		mi.ptszName = LPGENT("Conference");

 		mi.position = 200001;

-		mi.icolibItem = GetIconHandle(IDI_CONFERENCE);

+		mi.icolibItem = iconList[14].hIcolib;

 		hGCRoot = Menu_AddProtoMenuItem(&mi);

 

 		mi.ptszName = LPGENT("Contact list");

 		mi.position = 200002;

-		mi.icolibItem = GetIconHandle(IDI_LIST);

+		mi.icolibItem = iconList[7].hIcolib;

 		hCLRoot = Menu_AddProtoMenuItem(&mi);

 

 		if (hMenuRoot)

diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h
index 0885779876..8b5a5b313b 100644
--- a/protocols/Gadu-Gadu/src/gg.h
+++ b/protocols/Gadu-Gadu/src/gg.h
@@ -295,6 +295,7 @@ extern HINSTANCE hInstance;
 extern CLIST_INTERFACE *pcli;

 extern list_t g_Instances;

 extern PLUGININFOEX pluginInfo;

+extern IconItem iconList[];

 

 // Screen saver

 #ifndef SPI_GETSCREENSAVERRUNNING

diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp
index 48ab50ca81..e742263aae 100644
--- a/protocols/Gadu-Gadu/src/groupchat.cpp
+++ b/protocols/Gadu-Gadu/src/groupchat.cpp
@@ -72,7 +72,7 @@ void GGPROTO::gc_menus_init(HGENMENU hRoot)
 		mir_snprintf(service, sizeof(service), GGS_OPEN_CONF, m_szModuleName);

 		createObjService(service, &GGPROTO::gc_openconf);

 		mi.position = 2000050001;

-		mi.icolibItem = GetIconHandle(IDI_CONFERENCE);

+		mi.icolibItem = iconList[14].hIcolib;

 		mi.pszName = LPGEN("Open &conference...");

 		mi.pszService = service;

 		hMainMenu[0] = Menu_AddProtoMenuItem(&mi);

@@ -81,7 +81,7 @@ void GGPROTO::gc_menus_init(HGENMENU hRoot)
 		mir_snprintf(service, sizeof(service), GGS_CLEAR_IGNORED, m_szModuleName);

 		createObjService(service, &GGPROTO::gc_clearignored);

 		mi.position = 2000050002;

-		mi.icolibItem = GetIconHandle(IDI_CLEAR_CONFERENCE);

+		mi.icolibItem = iconList[15].hIcolib;

 		mi.pszName = LPGEN("&Clear ignored conferences");

 		mi.pszService = service;

 		hMainMenu[1] = Menu_AddProtoMenuItem(&mi);

diff --git a/protocols/Gadu-Gadu/src/icolib.cpp b/protocols/Gadu-Gadu/src/icolib.cpp
index c260942c33..91d10ae542 100644
--- a/protocols/Gadu-Gadu/src/icolib.cpp
+++ b/protocols/Gadu-Gadu/src/icolib.cpp
@@ -20,7 +20,7 @@
 

 #include "gg.h"

 

-static IconItem iconList[] =

+extern IconItem iconList[] =

 {

 	{ LPGEN("Protocol icon"),              "main",          IDI_GG               },

 	{ LPGEN("Import list from server"),    "importserver",  IDI_IMPORT_SERVER    },

diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp
index 0400891ba7..a24fffb720 100644
--- a/protocols/Gadu-Gadu/src/image.cpp
+++ b/protocols/Gadu-Gadu/src/image.cpp
@@ -76,7 +76,7 @@ int GGPROTO::img_init()
 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.flags = CMIF_ICONFROMICOLIB;

 	mi.position = -2000010000;

-	mi.icolibItem = GetIconHandle(IDI_IMAGE);

+	mi.icolibItem = iconList[11].hIcolib;

 	mi.pszName = LPGEN("&Image");

 	mi.pszService = service;

 	mi.pszContactOwner = m_szModuleName;

diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp
index 6de84ca6ff..3d71b9052a 100644
--- a/protocols/Gadu-Gadu/src/import.cpp
+++ b/protocols/Gadu-Gadu/src/import.cpp
@@ -610,7 +610,7 @@ void GGPROTO::import_init(HGENMENU hRoot)
 	mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTHANDLE;

 	mi.hParentMenu = hRoot;

 	mi.position = 2000500001;

-	mi.icolibItem = GetIconHandle(IDI_IMPORT_SERVER);

+	mi.icolibItem = iconList[1].hIcolib;

 	mi.pszName = LPGEN("Import List From &Server");

 	mi.pszService = service;

  	hMainMenu[2] = Menu_AddProtoMenuItem(&mi);

@@ -620,7 +620,7 @@ void GGPROTO::import_init(HGENMENU hRoot)
 	createObjService(service, &GGPROTO::import_text);

 

 	mi.position = 2000500002;

-	mi.icolibItem = GetIconHandle(IDI_IMPORT_TEXT);

+	mi.icolibItem = iconList[2].hIcolib;

 	mi.pszName = LPGEN("Import List From &Text File...");

 	mi.pszService = service;

 	hMainMenu[3] = Menu_AddProtoMenuItem(&mi);

@@ -630,7 +630,7 @@ void GGPROTO::import_init(HGENMENU hRoot)
 	createObjService(service, &GGPROTO::remove_server);

 

 	mi.position = 2000500003;

-	mi.icolibItem = GetIconHandle(IDI_REMOVE_SERVER);

+	mi.icolibItem = iconList[3].hIcolib;

 	mi.pszName = LPGEN("&Remove List From Server");

 	mi.pszService = service;

 	hMainMenu[4] = Menu_AddProtoMenuItem(&mi);

@@ -640,7 +640,7 @@ void GGPROTO::import_init(HGENMENU hRoot)
 	createObjService(service, &GGPROTO::export_server);

 

 	mi.position = 2005000001;

-	mi.icolibItem = GetIconHandle(IDI_EXPORT_SERVER);

+	mi.icolibItem = iconList[4].hIcolib;

 	mi.pszName = LPGEN("Export List To &Server");

 	mi.pszService = service;

 	hMainMenu[5] = Menu_AddProtoMenuItem(&mi);

@@ -650,7 +650,7 @@ void GGPROTO::import_init(HGENMENU hRoot)
 	createObjService(service, &GGPROTO::export_text);

 

 	mi.position = 2005000002;

-	mi.icolibItem = GetIconHandle(IDI_EXPORT_TEXT);

+	mi.icolibItem = iconList[5].hIcolib;

 	mi.pszName = LPGEN("Export List To &Text File...");

 	mi.pszService = service;

 	hMainMenu[6] = Menu_AddProtoMenuItem(&mi);

diff --git a/protocols/Gadu-Gadu/src/sessions.cpp b/protocols/Gadu-Gadu/src/sessions.cpp
index 48c460e432..764c4113d9 100644
--- a/protocols/Gadu-Gadu/src/sessions.cpp
+++ b/protocols/Gadu-Gadu/src/sessions.cpp
@@ -433,7 +433,7 @@ void GGPROTO::sessions_menus_init(HGENMENU hRoot)
 	mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi.hParentMenu = hRoot;

 	mi.position = (hMenuRoot) ? 2050000001 : 200003;

-	mi.icolibItem = GetIconHandle(IDI_SESSIONS);

+	mi.icolibItem = iconList[16].hIcolib;

 	mi.ptszName = LPGENT("Concurrent &sessions");

 	mi.pszService = service;

 	Menu_AddProtoMenuItem(&mi);