From 31b191bc8ddb639e488ab8306f71ac1dbabf16f0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 3 Nov 2012 17:32:37 +0000 Subject: removing built-in Clist Modern extra icons part I git-svn-id: http://svn.miranda-ng.org/main/trunk@2167 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SecureIM/src/commonheaders.cpp | 6 +-- plugins/SecureIM/src/commonheaders.h | 4 +- plugins/SecureIM/src/crypt.h | 2 - plugins/SecureIM/src/crypt_icons.cpp | 90 ++++++++-------------------------- plugins/SecureIM/src/main.cpp | 23 ++------- plugins/SecureIM/src/options.cpp | 18 ------- plugins/SecureIM/src/resource.h | 1 - plugins/SecureIM/src/svcs_clist.cpp | 30 ++++-------- 8 files changed, 37 insertions(+), 137 deletions(-) (limited to 'plugins/SecureIM/src') diff --git a/plugins/SecureIM/src/commonheaders.cpp b/plugins/SecureIM/src/commonheaders.cpp index 2c18f51e5d..881e69c38d 100644 --- a/plugins/SecureIM/src/commonheaders.cpp +++ b/plugins/SecureIM/src/commonheaders.cpp @@ -14,14 +14,14 @@ int iService=0; int iHook=0; HICON g_hICO[ICO_CNT], g_hPOP[POP_CNT], g_hIEC[1+IEC_CNT*MODE_CNT] = {0}; -IconExtraColumn g_IEC[1+IEC_CNT*MODE_CNT]; +HANDLE g_IEC[1+IEC_CNT*MODE_CNT]; int iBmpDepth; BOOL bCoreUnicode = false, bMetaContacts = false, bPopupExists = false, bPopupUnicode = false; BOOL bPGPloaded = false, bPGPkeyrings = false, bUseKeyrings = false, bPGPprivkey = false; BOOL bGPGloaded = false, bGPGkeyrings = false, bSavePass = false; BOOL bSFT, bSOM, bASI, bMCD, bSCM, bDGP, bAIP, bNOL, bAAK, bMCM; -BYTE bADV, bPGP, bGPG; +BYTE bPGP, bGPG; DWORD iCoreVersion = 0; CRITICAL_SECTION localQueueMutex; @@ -78,7 +78,6 @@ void GetFlags() { bSCM = DBGetContactSettingByte(0,szModuleName,"scm",0); bDGP = DBGetContactSettingByte(0,szModuleName,"dgp",0); bAIP = DBGetContactSettingByte(0,szModuleName,"aip",0); - bADV = DBGetContactSettingByte(0,szModuleName,"adv",0); bNOL = DBGetContactSettingByte(0,szModuleName,"nol",0); bAAK = DBGetContactSettingByte(0,szModuleName,"aak",0); bMCM = DBGetContactSettingByte(0,szModuleName,"mcm",0); @@ -93,7 +92,6 @@ void SetFlags() { DBWriteContactSettingByte(0,szModuleName,"scm",bSCM); DBWriteContactSettingByte(0,szModuleName,"dgp",bDGP); DBWriteContactSettingByte(0,szModuleName,"aip",bAIP); - DBWriteContactSettingByte(0,szModuleName,"adv",bADV); DBWriteContactSettingByte(0,szModuleName,"nol",bNOL); DBWriteContactSettingByte(0,szModuleName,"aak",bAAK); DBWriteContactSettingByte(0,szModuleName,"mcm",bMCM); diff --git a/plugins/SecureIM/src/commonheaders.h b/plugins/SecureIM/src/commonheaders.h index c848d43484..1f4e94b8e8 100644 --- a/plugins/SecureIM/src/commonheaders.h +++ b/plugins/SecureIM/src/commonheaders.h @@ -141,13 +141,13 @@ extern HANDLE *g_hService; extern HANDLE *g_hHook; extern int iService, iHook; extern HICON g_hICO[ICO_CNT], g_hIEC[1+IEC_CNT*MODE_CNT], g_hPOP[POP_CNT]; -extern IconExtraColumn g_IEC[1+IEC_CNT*MODE_CNT]; +extern HANDLE g_IEC[1+IEC_CNT*MODE_CNT]; extern int iBmpDepth; extern BOOL bCoreUnicode, bMetaContacts, bPopupExists, bPopupUnicode; extern BOOL bPGPloaded, bPGPkeyrings, bUseKeyrings, bPGPprivkey; extern BOOL bGPGloaded, bGPGkeyrings, bSavePass; extern BOOL bSFT, bSOM, bASI, bMCD, bSCM, bDGP, bAIP, bNOL, bAAK, bMCM; -extern BYTE bADV, bPGP, bGPG; +extern BYTE bPGP, bGPG; extern DWORD iCoreVersion; extern CRITICAL_SECTION localQueueMutex; diff --git a/plugins/SecureIM/src/crypt.h b/plugins/SecureIM/src/crypt.h index e626570f9e..be936d420f 100644 --- a/plugins/SecureIM/src/crypt.h +++ b/plugins/SecureIM/src/crypt.h @@ -139,8 +139,6 @@ BOOL isSecureIM(HANDLE hContact, BOOL emptyMirverAsSecureIM=FALSE); // crypt_icons.cpp HICON mode2icon(int,int); -HICON mode2icon2(int,int); // создает КОПИЮ иконки, которую надо разрушить -IconExtraColumn mode2iec(int); void RefreshContactListIcons(void); void ShowStatusIcon(HANDLE,UINT); void ShowStatusIcon(HANDLE); diff --git a/plugins/SecureIM/src/crypt_icons.cpp b/plugins/SecureIM/src/crypt_icons.cpp index f48e94278e..ed0b68d15a 100644 --- a/plugins/SecureIM/src/crypt_icons.cpp +++ b/plugins/SecureIM/src/crypt_icons.cpp @@ -1,6 +1,5 @@ #include "commonheaders.h" - typedef struct { HICON icon; SHORT mode; @@ -47,52 +46,19 @@ HICON mode2icon(int mode,int type) { return icon; } - -// преобразует mode в HICON который НУЖНО разрушить в конце -HICON mode2icon2(int mode,int type) { - return CopyIcon(mode2icon(mode,type)); -} - - -// преобразует mode в IconExtraColumn который НЕ нужно разрушать в конце -IconExtraColumn mode2iec(int mode) { - - int m=mode&0x0f,s=(mode&SECURED)>>4; // разобрали на части - режим и состояние - - if ( mode==-1 || (!s && !bASI && m!=MODE_PGP && m!=MODE_GPG)) { - return g_IEC[0]; // вернем пустое место - } - - int i=1+m*IEC_CNT+IEC_CL_DIS+s; - if ( g_IEC[i].hImage==(HANDLE)-1 ) { -/* g_hIEC[i] = mode2icon(mode,1); - g_IEC[i].hImage = (HANDLE) CallService(MS_CLIST_EXTRA_ADD_ICON, (WPARAM)g_hIEC[i], 0);*/ - HICON icon = mode2icon(mode,1); - g_IEC[i].hImage = (HANDLE) CallService(MS_CLIST_EXTRA_ADD_ICON, (WPARAM)icon, 0); - } - return g_IEC[i]; -} - - // обновляет иконки в clist и в messagew -void ShowStatusIcon(HANDLE hContact,int mode) { - +void ShowStatusIcon(HANDLE hContact,int mode) +{ HANDLE hMC = getMetaContact(hContact); - if ( bADV || g_hCLIcon ) { // обновить иконки в clist - if ( mode!= -1 ) { - IconExtraColumn iec=mode2iec(mode); - if ( g_hCLIcon ) { - ExtraIcon_SetIcon(g_hCLIcon, hContact, iec.hImage); - if ( hMC ) - ExtraIcon_SetIcon(g_hCLIcon, hMC, iec.hImage); - } - else { - CallService(MS_CLIST_EXTRA_SET_ICON, (WPARAM)hContact, (LPARAM)&iec); - if ( hMC ) - CallService(MS_CLIST_EXTRA_SET_ICON, (WPARAM)hMC, (LPARAM)&iec); - } - } + + // обновить иконки в clist + if (mode != -1) { + HICON hIcon = mode2icon(mode, 1); + ExtraIcon_SetIcon(g_hCLIcon, hContact, hIcon); + if ( hMC ) + ExtraIcon_SetIcon(g_hCLIcon, hMC, hIcon); } + if ( ServiceExists(MS_MSG_MODIFYICON)) { // обновить иконки в srmm StatusIconData sid; memset(&sid,0,sizeof(sid)); @@ -100,52 +66,36 @@ void ShowStatusIcon(HANDLE hContact,int mode) { sid.szModule = (char*)szModuleName; for(int i=MODE_NATIVE; ipszText); @@ -268,9 +265,6 @@ INT_PTR CALLBACK DlgProcOptionsGeneral(HWND hDlg, UINT wMsg, WPARAM wParam, LPAR lvc.cx = iColWidth[i]; LV_InsertColumn(hLV, i, &lvc); } - for (i = 0; szAdvancedIcons[i]; i++) { - SendMessage(GetDlgItem(hDlg, IDC_ADVICON), CB_ADDSTRING, 0, (LPARAM) Translate(szAdvancedIcons[i])); - } RefreshGeneralDlg(hDlg,TRUE); EnableWindow(hLV, true); @@ -442,7 +436,6 @@ INT_PTR CALLBACK DlgProcOptionsGeneral(HWND hDlg, UINT wMsg, WPARAM wParam, LPAR case IDC_SCM: case IDC_DGP: case IDC_OKT: - case IDC_ADVICON: break; default: @@ -1131,12 +1124,6 @@ void RefreshGeneralDlg(HWND hDlg, BOOL iInit) { SendMessage(GetDlgItem(hDlg,IDC_AAK),BM_SETCHECK,(bAAK)?BST_CHECKED:BST_UNCHECKED,0L); SendMessage(GetDlgItem(hDlg,IDC_MCM),BM_SETCHECK,(bMCM)?BST_CHECKED:BST_UNCHECKED,0L); - // Advanced - SendMessage(GetDlgItem(hDlg, IDC_ADVICON), CB_SETCURSEL, bADV, 0); - if ( g_hCLIcon ) { - EnableWindow(GetDlgItem(hDlg, IDC_ADVICON), false); - } - // Select {OFF,PGP,GPG} SendMessage(GetDlgItem(hDlg,IDC_PGP),BM_SETCHECK,bPGP?BST_CHECKED:BST_UNCHECKED,0L); SendMessage(GetDlgItem(hDlg,IDC_GPG),BM_SETCHECK,bGPG?BST_CHECKED:BST_UNCHECKED,0L); @@ -1376,10 +1363,6 @@ void ResetGeneralDlg(HWND hDlg) { SendMessage(GetDlgItem(hDlg,IDC_AIP),BM_SETCHECK,BST_UNCHECKED,0L); SendMessage(GetDlgItem(hDlg,IDC_MCM),BM_SETCHECK,BST_UNCHECKED,0L); -// for(int i=0;i