From a27b07c35565ced7f690890dcba29518ae2e4928 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 6 Sep 2016 18:26:47 +0000 Subject: MS_CLIST_SYSTRAY_NOTIFY - more useless code removed git-svn-id: http://svn.miranda-ng.org/main/trunk@17268 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/delphi/m_clist.inc | 67 ----------------------------------- include/delphi/m_clistint.inc | 2 +- include/m_clist.h | 81 ++++++++++++++++++------------------------- include/m_clistint.h | 2 +- 4 files changed, 35 insertions(+), 117 deletions(-) (limited to 'include') diff --git a/include/delphi/m_clist.inc b/include/delphi/m_clist.inc index ea4ce13e31..f4af29552d 100644 --- a/include/delphi/m_clist.inc +++ b/include/delphi/m_clist.inc @@ -187,71 +187,4 @@ function Clist_GroupCreate(hParentGroup:integer; groupName:PWideChar) : integer; procedure Clist_ContactDoubleClicked(hContact:TMCONTACT); stdcall; external AppDll; -const - { - wParam=0 (not used) - lParam=(LPARAM) &MIRANDASYSTRAYNOTIFY - - Affects: Show a message in a ballon tip against a protocol icon (if installed) - Returns: 0 on success, non zero on failure - Notes : This service will not be created on systems that haven't got the Windows - support for ballontips, also note that it's upto Windows if it shows your - message and it keeps check of delays (don't be stupid about showing messages) - - Version: 0.3.1a - } - NIIF_INFO = $00000001; - NIIF_WARNING = $00000002; - NIIF_ERROR = $00000003; - NIIF_ICON_MASK = $0000000F; - NIIF_NOSOUND = $00000010; - NIIF_INTERN_UNICODE = $00000100; - -type - PMIRANDASYSTRAYNOTIFY = ^TMIRANDASYSTRAYNOTIFY; - TMIRANDASYSTRAYNOTIFY = record - cbSize :int; // sizeof(MIRANDASYSTRAY) - szProto :PAnsiChar; // protocol to show under (may have no effect) - szInfoTitle:TChar; // only 64chars of it will be used, TCHAR if NIIF_INTERN_UNICODE is specified - szInfo :TChar; // only 256chars of it will be used, TCHAR if NIIF_INTERN_UNICODE is specified - dwInfoFlags:dword; // see NIIF_* stuff - uTimeout :uint; // how long to show the tip for - end; - -const - MS_CLIST_SYSTRAY_NOTIFY:PAnsiChar = 'Miranda/Systray/Notify'; - -const - SETTING_TOOLWINDOW_DEFAULT = 1; - SETTING_SHOWMAINMENU_DEFAULT = 1; - SETTING_SHOWCAPTION_DEFAULT = 1; - SETTING_CLIENTDRAG_DEFAULT = 0; - SETTING_ONTOP_DEFAULT = 1; - SETTING_MIN2TRAY_DEFAULT = 1; - SETTING_TRAY1CLICK_DEFAULT = 0; - SETTING_HIDEOFFLINE_DEFAULT = 0; - SETTING_HIDEEMPTYGROUPS_DEFAULT = 0; - SETTING_USEGROUPS_DEFAULT = 1; - SETTING_SORTBYSTATUS_DEFAULT = 0; - SETTING_SORTBYPROTO_DEFAULT = 0; - SETTING_TRANSPARENT_DEFAULT = 0; - SETTING_ALPHA_DEFAULT = 200; - SETTING_AUTOALPHA_DEFAULT = 150; - SETTING_CONFIRMDELETE_DEFAULT = 1; - SETTING_AUTOHIDE_DEFAULT = 0; - SETTING_HIDETIME_DEFAULT = 30; - SETTING_CYCLETIME_DEFAULT = 4; - SETTING_ALWAYSSTATUS_DEFAULT = 0; - SETTING_ALWAYSMULTI_DEFAULT = 0; - - SETTING_TRAYICON_SINGLE = 0; - SETTING_TRAYICON_CYCLE = 1; - SETTING_TRAYICON_MULTI = 2; - SETTING_TRAYICON_DEFAULT = SETTING_TRAYICON_SINGLE; - - SETTING_STATE_HIDDEN = 0; - SETTING_STATE_MINIMIZED = 1; - SETTING_STATE_NORMAL = 2; - SETTING_BRINGTOFRONT_DEFAULT = 0; - {$ENDIF} diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc index f472cd2775..26d8b125f5 100644 --- a/include/delphi/m_clistint.inc +++ b/include/delphi/m_clistint.inc @@ -403,7 +403,7 @@ type pfnTrayIconIconsChanged : procedure ; cdecl; pfnTrayIconPauseAutoHide : function (wParam:WPARAM; lParam:LPARAM):int; cdecl; pfnTrayIconProcessMessage : function (wParam:WPARAM; lParam:LPARAM):int_ptr; cdecl; - pfnCListTrayNotify : function (_para1:PMIRANDASYSTRAYNOTIFY):int; cdecl; + blablabla5 : procedure; cdecl; (* clui.c *) pfnContactListWndProc:function(hwnd:HWND; msg:uint; wParam:WPARAM; lParam:LPARAM):int; stdcall; diff --git a/include/m_clist.h b/include/m_clist.h index 68e269b71e..ceb97c6b44 100644 --- a/include/m_clist.h +++ b/include/m_clist.h @@ -498,9 +498,6 @@ EXTERN_C MIR_APP_DLL(int) Clist_ContactCompare(MCONTACT hContact1, MCONTACT hCon #define ME_CLUI_CONTACTDRAGSTOP "CLUI/ContactDragStop" ///////////////////////////////////////////////////////////////////////////////////////// -// wParam = 0 (not used) -// lParam = (LPARAM) &MIRANDASYSTRAYNOTIFY -// // Affects: Show a message in a ballon tip against a protocol icon (if installed) // Returns: 0 on success, non zero on failure // Notes : This service will not be created on systems that haven't got the Windows @@ -512,54 +509,42 @@ EXTERN_C MIR_APP_DLL(int) Clist_ContactCompare(MCONTACT hContact1, MCONTACT hCon #define NIIF_ERROR 0x00000003 #define NIIF_ICON_MASK 0x0000000F #define NIIF_NOSOUND 0x00000010 -#define NIIF_INTERN_UNICODE 0x00000100 -typedef struct { - int cbSize; // sizeof(MIRANDASYSTRAY) - char *szProto; // protocol to show under (may have no effect) - union { - char *szInfoTitle; // only 64chars of it will be used - wchar_t *tszInfoTitle; // used if NIIF_INTERN_UNICODE is specified - }; - union { - char *szInfo; // only 256chars of it will be used - wchar_t *tszInfo; // used if NIIF_INTERN_UNICODE is specified - }; - DWORD dwInfoFlags; // see NIIF_* stuff - UINT uTimeout; // how long to show the tip for -} MIRANDASYSTRAYNOTIFY; -#define MS_CLIST_SYSTRAY_NOTIFY "Miranda/Systray/Notify" - -#define SETTING_TOOLWINDOW_DEFAULT 1 -#define SETTING_SHOWMAINMENU_DEFAULT 1 -#define SETTING_SHOWCAPTION_DEFAULT 1 -#define SETTING_CLIENTDRAG_DEFAULT 1 -#define SETTING_ONTOP_DEFAULT 1 -#define SETTING_MIN2TRAY_DEFAULT 1 -#define SETTING_TRAY1CLICK_DEFAULT (IsWinVer7Plus()?1:0) -#define SETTING_HIDEOFFLINE_DEFAULT 0 +EXTERN_C MIR_APP_DLL(int) Clist_TrayNotifyA(const char *szProto, const char *szInfoTitle, const char *szInfo, DWORD dwInfoFlags, UINT uTimeout); +EXTERN_C MIR_APP_DLL(int) Clist_TrayNotifyW(const char *szProto, const wchar_t *wszInfoTitle, const wchar_t *wszInfo, DWORD dwInfoFlags, UINT uTimeout); + +///////////////////////////////////////////////////////////////////////////////////////// + +#define SETTING_TOOLWINDOW_DEFAULT 1 +#define SETTING_SHOWMAINMENU_DEFAULT 1 +#define SETTING_SHOWCAPTION_DEFAULT 1 +#define SETTING_CLIENTDRAG_DEFAULT 1 +#define SETTING_ONTOP_DEFAULT 1 +#define SETTING_MIN2TRAY_DEFAULT 1 +#define SETTING_TRAY1CLICK_DEFAULT (IsWinVer7Plus()?1:0) +#define SETTING_HIDEOFFLINE_DEFAULT 0 #define SETTING_HIDEEMPTYGROUPS_DEFAULT 0 -#define SETTING_USEGROUPS_DEFAULT 1 -#define SETTING_SORTBYSTATUS_DEFAULT 0 -#define SETTING_SORTBYPROTO_DEFAULT 0 -#define SETTING_TRANSPARENT_DEFAULT 0 -#define SETTING_ALPHA_DEFAULT 200 -#define SETTING_AUTOALPHA_DEFAULT 150 +#define SETTING_USEGROUPS_DEFAULT 1 +#define SETTING_SORTBYSTATUS_DEFAULT 0 +#define SETTING_SORTBYPROTO_DEFAULT 0 +#define SETTING_TRANSPARENT_DEFAULT 0 +#define SETTING_ALPHA_DEFAULT 200 +#define SETTING_AUTOALPHA_DEFAULT 150 #define SETTING_CONFIRMDELETE_DEFAULT 1 -#define SETTING_AUTOHIDE_DEFAULT 0 -#define SETTING_HIDETIME_DEFAULT 30 -#define SETTING_CYCLETIME_DEFAULT 4 -#define SETTING_TRAYICON_DEFAULT SETTING_TRAYICON_SINGLE -#define SETTING_ALWAYSSTATUS_DEFAULT 0 -#define SETTING_ALWAYSMULTI_DEFAULT 0 - -#define SETTING_TRAYICON_SINGLE 0 -#define SETTING_TRAYICON_CYCLE 1 -#define SETTING_TRAYICON_MULTI 2 - -#define SETTING_STATE_HIDDEN 0 -#define SETTING_STATE_MINIMIZED 1 -#define SETTING_STATE_NORMAL 2 +#define SETTING_AUTOHIDE_DEFAULT 0 +#define SETTING_HIDETIME_DEFAULT 30 +#define SETTING_CYCLETIME_DEFAULT 4 +#define SETTING_TRAYICON_DEFAULT SETTING_TRAYICON_SINGLE +#define SETTING_ALWAYSSTATUS_DEFAULT 0 +#define SETTING_ALWAYSMULTI_DEFAULT 0 + +#define SETTING_TRAYICON_SINGLE 0 +#define SETTING_TRAYICON_CYCLE 1 +#define SETTING_TRAYICON_MULTI 2 + +#define SETTING_STATE_HIDDEN 0 +#define SETTING_STATE_MINIMIZED 1 +#define SETTING_STATE_NORMAL 2 #define SETTING_BRINGTOFRONT_DEFAULT 0 diff --git a/include/m_clistint.h b/include/m_clistint.h index 648eb84dda..232ff67afd 100644 --- a/include/m_clistint.h +++ b/include/m_clistint.h @@ -383,7 +383,7 @@ struct CLIST_INTERFACE void (*pfnTrayIconIconsChanged)(void); int (*pfnTrayIconPauseAutoHide)(WPARAM wParam, LPARAM lParam); INT_PTR (*pfnTrayIconProcessMessage)(WPARAM wParam, LPARAM lParam); - int (*pfnCListTrayNotify)(MIRANDASYSTRAYNOTIFY*); + int (*blablabla5)(); /* clui.c */ LRESULT (CALLBACK *pfnContactListWndProc)(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); -- cgit v1.2.3