modified: commonheaders.h

	modified:   icons.cpp
	modified:   icons/secured.ico
	modified:   icons/unsecured.ico
	modified:   init.cpp
	modified:   new_gpg.rc
	modified:   new_gpg.vcproj
	modified:   options.cpp
	modified:   resource.h
	modified:   utilities.cpp

1 files changed, 60 insertions, 0 deletions

diff --git a/icons.cpp b/icons.cpp
index 94603b8..23cee80 100644
--- a/icons.cpp
+++ b/icons.cpp
@@ -16,6 +16,66 @@
 

 #include "commonheaders.h"

 

+HANDLE IconLibDefine(TCHAR* desc, TCHAR* section, char* ident, HICON icon, char* def_file, int def_idx, int size)
+{
+  SKINICONDESC sid = {0};
+  HANDLE hIcon;
+
+  if(!size)
+	  size = 16;
+
+  sid.cbSize = SKINICONDESC_SIZE;
+  sid.ptszSection = section;
+  sid.ptszDescription = desc;
+  sid.flags = SIDF_TCHAR;
+
+  sid.pszName = ident;
+  sid.pszDefaultFile = def_file;
+  sid.iDefaultIndex = def_idx;
+  sid.hDefaultIcon = icon;
+  sid.cx = sid.cy = size;
+
+  hIcon = (HANDLE)CallService(MS_SKIN2_ADDICON, 0, (LPARAM)&sid);
+
+  return hIcon;
+}
+

+

+void InitIconLib()
+{
+	extern HINSTANCE hInst;
+    char lib[MAX_PATH];
+    GetModuleFileNameA(hInst, lib, MAX_PATH);
+	TCHAR *module = mir_a2t(szGPGModuleName);
+
+	IconLibDefine(_T("Secured"), module, "secured", NULL, lib, -IDI_SECURED,0);
+	IconLibDefine(_T("Unsecured"), module, "unsecured", NULL, lib, -IDI_UNSECURED,0);
+	mir_free(module);
+}
+
+
+
+
+
+HICON IconLibGetIcon(const char* ident)
+{
+  return (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)ident);
+}
+
+
+
+void IconLibReleaseIcon(const char* ident)
+{
+  CallService(MS_SKIN2_RELEASEICON, 0, (LPARAM)ident);
+}
+
+
+
+HANDLE IconLibHookIconsChanged(MIRANDAHOOK hook)
+{
+  return HookEvent(ME_SKIN2_ICONSCHANGED, hook);
+}
+

 

 // обновляет иконки в clist и в messagew

 void ShowStatusIcon(HANDLE hContact,bool enabled) {