Clist_modern: tray icons refactoring.

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

3 files changed, 9 insertions, 6 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_clc.h b/plugins/Clist_modern/src/hdr/modern_clc.h
index e84b1f1779..68b6aa4518 100644
--- a/plugins/Clist_modern/src/hdr/modern_clc.h
+++ b/plugins/Clist_modern/src/hdr/modern_clc.h
@@ -32,10 +32,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "modern_defsettings.h"

 #include "modern_clist.h"

 

-#define SETTING_TRAYICON_SINGLE   0

-#define SETTING_TRAYICON_CYCLE    1

-#define SETTING_TRAYICON_MULTI    2

-

 #define NIIF_INTERN_UNICODE 0x00000100

 

 #define SETTING_STATE_HIDDEN      0

diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
index 07d0d510a7..003200d1c0 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
@@ -83,6 +83,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_langpack.h>

 #include <m_options.h>

 #include <m_protosvc.h>

+#include <m_protoint.h>

 #include <m_clistint.h>

 #include <m_skin.h>

 #include <m_contacts.h>

@@ -368,4 +369,9 @@ public:
 	};

 };

 

+#define TRAY_ICON_MODE_GLOBAL		1

+#define TRAY_ICON_MODE_ACC			2

+#define TRAY_ICON_MODE_CYCLE		4

+#define	TRAY_ICON_MODE_ALL			8

+

 #endif // commonheaders_h__

diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
index 7c0cea9fab..f20919dc43 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
@@ -297,8 +297,6 @@ int     cliShowHide(WPARAM wParam, LPARAM lParam);
 BOOL    CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect,BOOL bErase );

 int     cliCompareContacts(const ClcContact *contact1,const ClcContact *contact2);

 int     cliFindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);

-int     cliTrayCalcChanged(const char *szChangedProto, int averageMode, int netProtoCount);

-int     cliTrayIconPauseAutoHide(WPARAM wParam, LPARAM lParam);

 void    cliCluiProtocolStatusChanged(int status,const char * proto);

 HMENU   cliBuildGroupPopupMenu(ClcGroup *group);

 void    cliInvalidateDisplayNameCacheEntry(MCONTACT hContact);

@@ -307,6 +305,9 @@ void    cli_SaveStateAndRebuildList(HWND hwnd, ClcData *dat);
 void    CLUI_cli_LoadCluiGlobalOpts(void);

 INT_PTR cli_TrayIconProcessMessage(WPARAM wParam, LPARAM lParam);

 BOOL    CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect,BOOL bErase );

+int		cliTrayIconInit(HWND hwnd);

+int		cliTrayIconAdd(HWND hwnd, const char *szProto, const char *szIconProto, int status);

+void	cliTrayIconUpdateBase(const char *szChangedProto);

 

 ClcContact*    cliCreateClcContact( void );

 ClcCacheEntry* cliCreateCacheItem(MCONTACT hContact);