From 33ed395de0eb385315d949c77b4e1289a6684112 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 31 Mar 2013 19:09:56 +0000 Subject: code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@4267 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SecureIM/src/crypt_popups.cpp | 151 ++++++++++++++-------------------- 1 file changed, 64 insertions(+), 87 deletions(-) (limited to 'plugins/SecureIM/src/crypt_popups.cpp') diff --git a/plugins/SecureIM/src/crypt_popups.cpp b/plugins/SecureIM/src/crypt_popups.cpp index 6f217273c1..721dafd0b5 100644 --- a/plugins/SecureIM/src/crypt_popups.cpp +++ b/plugins/SecureIM/src/crypt_popups.cpp @@ -1,78 +1,44 @@ #include "commonheaders.h" -/* -static int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - switch(message) { - case WM_COMMAND: - if (wParam == STN_CLICKED) { // It was a click on the Popup. - PUDeletePopUp(hWnd); - return TRUE; - } - break; - case UM_FREEPLUGINDATA: { - return TRUE; //TRUE or FALSE is the same, it gets ignored. - } - default: - break; - } - return DefWindowProc(hWnd, message, wParam, lParam); -} -*/ - -void showPopUp(LPCSTR lpzText,HANDLE hContact,HICON hIcon, UINT type) { +void showPopUp(LPCSTR lpzText,HANDLE hContact,HICON hIcon, UINT type) +{ //type=0 key colors //type=1 session colors //type=2 SR colors if (!bPopupExists) return; - //hContact = A_VALID_HANDLE_YOU_GOT_FROM_SOMEWHERE; - COLORREF colorBackKey = RGB(230,230,255); - COLORREF colorTextKey = RGB(0,0,0); - COLORREF colorBackSec = RGB(255,255,200); - COLORREF colorTextSec = RGB(0,0,0); - COLORREF colorBackSR = RGB(200,255,200); - COLORREF colorTextSR = RGB(0,0,0); - COLORREF colorBack = 0; - COLORREF colorText = 0; + COLORREF colorBack, colorText; int timeout=0; - int res; - DBVARIANT dbv_timeout; + DBVARIANT dbv; - if (type==0) { - colorBack=DBGetContactSettingDword(0,MODULENAME,"colorKeyb",(UINT)-1); - colorText=DBGetContactSettingDword(0,MODULENAME,"colorKeyt",(UINT)-1); - if (colorBack==(UINT)-1) colorBack=colorBackKey; - if (colorText==(UINT)-1) colorText=colorTextKey; - - res=DBGetContactSetting(0,MODULENAME,"timeoutKey",&dbv_timeout); - if (res==0) timeout=atoi(dbv_timeout.pszVal); - DBFreeVariant(&dbv_timeout); + if (type == 0) { + colorBack = db_get_dw(0, MODULENAME, "colorKeyb", RGB(230,230,255)); + colorText = db_get_dw(0, MODULENAME, "colorKeyt", RGB(0,0,0)); + if (!db_get_s(0, MODULENAME, "timeoutKey", &dbv)) { + timeout = atoi(dbv.pszVal); + db_free(&dbv); + } } - else if (type==1) { - colorBack=DBGetContactSettingDword(0,MODULENAME,"colorSecb",(UINT)-1); - colorText=DBGetContactSettingDword(0,MODULENAME,"colorSect",(UINT)-1); - if (colorBack==(UINT)-1) colorBack=colorBackSec; - if (colorText==(UINT)-1) colorText=colorTextSec; - - res=DBGetContactSetting(0,MODULENAME,"timeoutSec",&dbv_timeout); - if (res==0) timeout=atoi(dbv_timeout.pszVal); - DBFreeVariant(&dbv_timeout); + else if (type == 1) { + colorBack = db_get_dw(0, MODULENAME, "colorSecb", RGB(255,255,200)); + colorText = db_get_dw(0, MODULENAME, "colorSect", RGB(0,0,0)); + if (!db_get_s(0, MODULENAME, "timeoutSec" ,&dbv)) { + timeout = atoi(dbv.pszVal); + db_free(&dbv); + } } - else if (type>=2) { - colorBack=DBGetContactSettingDword(0, MODULENAME, "colorSRb", (UINT)-1); - colorText=DBGetContactSettingDword(0, MODULENAME, "colorSRt", (UINT)-1); - if (colorBack==(UINT)-1) colorBack=colorBackSR; - if (colorText==(UINT)-1) colorText=colorTextSR; - - res=DBGetContactSetting(0,MODULENAME,"timeoutSR",&dbv_timeout); - if (res==0) timeout=atoi(dbv_timeout.pszVal); - DBFreeVariant(&dbv_timeout); + else if (type >= 2) { + colorBack = db_get_dw(0, MODULENAME, "colorSRb", RGB(200,255,200)); + colorText = db_get_dw(0, MODULENAME, "colorSRt", RGB(0,0,0)); + if (!db_get_s(0, MODULENAME, "timeoutSR", &dbv)) { + timeout = atoi(dbv.pszVal); + db_free(&dbv); + } } POPUPDATAW ppd = {0}; - ppd.lchContact = hContact; //Be sure to use a GOOD handle, since this will not be checked. ppd.lchIcon = hIcon; LPWSTR lpwzContactName = (LPWSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,(WPARAM)hContact,GSMDF_UNICODE); @@ -83,46 +49,57 @@ void showPopUp(LPCSTR lpzText,HANDLE hContact,HICON hIcon, UINT type) { ppd.colorBack = colorBack; ppd.colorText = colorText; ppd.iSeconds = timeout; - - //Now that every field has been filled, we want to see the popup. PUAddPopUpW(&ppd); } - -void showPopUpDCmsg(HANDLE hContact,LPCSTR msg) { - int indic=db_get_b(0, MODULENAME, "dc",1); - if (indic==1) showPopUp(msg,hContact,g_hPOP[POP_PU_DIS],1); +void showPopUpDCmsg(HANDLE hContact,LPCSTR msg) +{ + if (db_get_b(0, MODULENAME, "dc", 1)) + showPopUp(msg, hContact, g_hPOP[POP_PU_DIS], 1); } -void showPopUpDC(HANDLE hContact) { - int indic=db_get_b(0, MODULENAME, "dc",1); - if (indic==1) showPopUp(sim006,hContact,g_hPOP[POP_PU_DIS],1); + +void showPopUpDC(HANDLE hContact) +{ + if (db_get_b(0, MODULENAME, "dc", 1)) + showPopUp(sim006, hContact, g_hPOP[POP_PU_DIS], 1); } -void showPopUpEC(HANDLE hContact) { - int indic=db_get_b(0, MODULENAME, "ec",1); - if (indic==1) showPopUp(sim001,hContact,g_hPOP[POP_PU_EST],1); + +void showPopUpEC(HANDLE hContact) +{ + if (db_get_b(0, MODULENAME, "ec", 1)) + showPopUp(sim001, hContact, g_hPOP[POP_PU_EST], 1); } -void showPopUpKS(HANDLE hContact) { - int indic=db_get_b(0, MODULENAME, "ks",1); - if (indic==1) showPopUp(sim007,hContact,g_hPOP[POP_PU_PRC],0); + +void showPopUpKS(HANDLE hContact) +{ + if (db_get_b(0, MODULENAME, "ks",1)) + showPopUp(sim007, hContact, g_hPOP[POP_PU_PRC], 0); } -void showPopUpKRmsg(HANDLE hContact,LPCSTR msg) { - int indic=db_get_b(0, MODULENAME, "kr",1); - if (indic==1) showPopUp(msg,hContact,g_hPOP[POP_PU_PRC],0); + +void showPopUpKRmsg(HANDLE hContact,LPCSTR msg) +{ + if (db_get_b(0, MODULENAME, "kr", 1)) + showPopUp(msg, hContact, g_hPOP[POP_PU_PRC], 0); } -void showPopUpKR(HANDLE hContact) { - int indic=db_get_b(0, MODULENAME, "kr",1); - if (indic==1) showPopUp(sim008,hContact,g_hPOP[POP_PU_PRC],0); + +void showPopUpKR(HANDLE hContact) +{ + if (db_get_b(0, MODULENAME, "kr", 1)) + showPopUp(sim008, hContact, g_hPOP[POP_PU_PRC], 0); } -void showPopUpSM(HANDLE hContact) { - int indic=db_get_b(0, MODULENAME, "ss",0); - if (indic==1) showPopUp(sim009,hContact,g_hPOP[POP_PU_MSS],2); + +void showPopUpSM(HANDLE hContact) +{ + if (db_get_b(0, MODULENAME, "ss", 0)) + showPopUp(sim009, hContact, g_hPOP[POP_PU_MSS], 2); SkinPlaySound("OutgoingSecureMessage"); } -void showPopUpRM(HANDLE hContact) { - int indic=db_get_b(0, MODULENAME, "sr",0); - if (indic==1) showPopUp(sim010,hContact,g_hPOP[POP_PU_MSR],2); + +void showPopUpRM(HANDLE hContact) +{ + if (db_get_b(0, MODULENAME, "sr", 0)) + showPopUp(sim010, hContact, g_hPOP[POP_PU_MSR], 2); SkinPlaySound("IncomingSecureMessage"); } - // EOF -- cgit v1.2.3