From b7a7d90f054d48dfda64e8a11d4f5cbb3fe2a521 Mon Sep 17 00:00:00 2001 From: Szymon Tokarz Date: Fri, 26 Jun 2015 13:57:26 +0000 Subject: MirFox - fix Options Contacts list checking (use EMPTY_EXTRA_ICON from m_extraicons.h instead of 0xFF) - minor fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@14399 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MirFox/src/MirandaOptions.cpp | 16 ++++++---------- plugins/MirFox/src/MirfoxData.cpp | 3 ++- plugins/MirFox/src/common.h | 2 +- plugins/MirFox/src/lib/MirFoxCommons_sharedMemory.h | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) (limited to 'plugins/MirFox/src') diff --git a/plugins/MirFox/src/MirandaOptions.cpp b/plugins/MirFox/src/MirandaOptions.cpp index cf06ef7359..405cf4923f 100644 --- a/plugins/MirFox/src/MirandaOptions.cpp +++ b/plugins/MirFox/src/MirandaOptions.cpp @@ -173,7 +173,7 @@ static void setListContactIcons(HWND hwndList){ HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, hContact, 0); if(hItem) { //if icon on 0th extracolumn is not set - if(SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(0,0)) == 0xFF){ + if(SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(0,0)) == EMPTY_EXTRA_ICON){ //check contact state on/off if (MFENUM_MIRANDACONTACT_STATE_ON == mirandaContactsIter->contactState){ //if on - set icon 1 on 0th extracolumn @@ -239,7 +239,7 @@ static void setListGroupIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentIt if(iconOn[i] && iImage==0){ iconOn[i]=0; } - if(iImage!=0xFF){ + if(iImage!=EMPTY_EXTRA_ICON){ childCount[i]++; } } @@ -248,7 +248,7 @@ static void setListGroupIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentIt //set icons for( i=0; i < _countof(iconOn); i++) { - SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hParentItem, MAKELPARAM(i,childCount[i]?(iconOn[i]?i+1:0):0xFF)); + SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hParentItem, MAKELPARAM(i,childCount[i]?(iconOn[i]?i+1:0):EMPTY_EXTRA_ICON)); if(groupChildCount){ groupChildCount[i]+=childCount[i]; } @@ -289,7 +289,7 @@ static void setAllChildIcons(HWND hwndList, HANDLE hFirstItem, int iColumn, int while(hItem) { int iOldIcon = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, iColumn); - if(iOldIcon!=0xFF && iOldIcon!=iImage){ + if(iOldIcon!=EMPTY_EXTRA_ICON && iOldIcon!=iImage){ SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn,iImage)); } hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hItem); @@ -312,7 +312,7 @@ HICON icoHandle_ICON_OFF; HICON icoHandle_ICON_FF; /* - * funkcja callback obsługująca stronę z opcjami tab 2 + * callback function for tab 2 options page */ INT_PTR CALLBACK DlgProcOpts_Tab2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -335,10 +335,6 @@ INT_PTR CALLBACK DlgProcOpts_Tab2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM icoHandle_ICON_OFF = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ICON_OFF)); icoHandle_ICON_FF = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ICON_FF)); - //TODO load icons (icolib) - no need to use DestroyIcon - //HICON icoHandle_ICON_OFF = (HICON)CallService(MS_SKIN2_GETICONBYHANDLE, 0, (LPARAM)mirfoxData.icoHandle_ICON_OFF); - //HICON icoHandle_ICON_FF = (HICON)CallService(MS_SKIN2_GETICONBYHANDLE, 0, (LPARAM)mirfoxData.icoHandle_ICON_FF); - //add icons to ImageList list ImageList_AddIcon(hIml, icoHandle_ICON_OFF); ImageList_AddIcon(hIml, icoHandle_ICON_FF); @@ -468,7 +464,7 @@ INT_PTR CALLBACK DlgProcOpts_Tab2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM int iImage = SendDlgItemMessage(hwndDlg, IDC2_CONTACTS_LIST, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(0,0)); MFENUM_MIRANDACONTACT_STATE contactState; - if (iImage == 0xFF){ //TODO impossible?? + if (iImage == EMPTY_EXTRA_ICON){ //TODO impossible?? } else { if (iImage == 1){ contactState = MFENUM_MIRANDACONTACT_STATE_ON; diff --git a/plugins/MirFox/src/MirfoxData.cpp b/plugins/MirFox/src/MirfoxData.cpp index 17d5a782ab..abd980f02e 100644 --- a/plugins/MirFox/src/MirfoxData.cpp +++ b/plugins/MirFox/src/MirfoxData.cpp @@ -216,7 +216,8 @@ MirfoxData::initializeMirfoxData() MirfoxData::shouldProtoBeActiveByName(std::string protoName) { if ( - boost::iequals("ExchangeRates", protoName) + boost::iequals("MetaContacts", protoName) + || boost::iequals("ExchangeRates", protoName) || boost::iequals("mTV", protoName) || boost::iequals("Quotes", protoName) || boost::iequals("Weather", protoName) diff --git a/plugins/MirFox/src/common.h b/plugins/MirFox/src/common.h index d593657452..90aa3e84c4 100644 --- a/plugins/MirFox/src/common.h +++ b/plugins/MirFox/src/common.h @@ -15,7 +15,7 @@ #include #include #include -//for future use #include +#include #define PLUGIN_DB_ID "MirFox" diff --git a/plugins/MirFox/src/lib/MirFoxCommons_sharedMemory.h b/plugins/MirFox/src/lib/MirFoxCommons_sharedMemory.h index c488268ee6..8ccc1494cf 100644 --- a/plugins/MirFox/src/lib/MirFoxCommons_sharedMemory.h +++ b/plugins/MirFox/src/lib/MirFoxCommons_sharedMemory.h @@ -105,7 +105,7 @@ public: void updateCsmTimestamp(boost::interprocess::windows_shared_memory& updateCsm, uint16_t processCsmId); - //dla wszystkich innych rekordďż˝w w csm w statusie W, sprawdza czy rekord w csm nie jest przeterminowany jeli tak to go usuwa + //for every other CSM records with 'W' status, check if record is outdated, if yes then delete this record void checkAnotherCsm(boost::interprocess::windows_shared_memory& checkedCsm, uint16_t processCsmId); //unload and free shared memory records and structures -- cgit v1.2.3