summaryrefslogtreecommitdiff
path: root/plugins/RecentContacts
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/RecentContacts')
-rw-r--r--plugins/RecentContacts/src/RecentContacts.cpp146
-rw-r--r--plugins/RecentContacts/src/options.cpp34
-rw-r--r--plugins/RecentContacts/src/stdafx.h55
-rw-r--r--plugins/RecentContacts/src/version.h16
4 files changed, 124 insertions, 127 deletions
diff --git a/plugins/RecentContacts/src/RecentContacts.cpp b/plugins/RecentContacts/src/RecentContacts.cpp
index 4148295222..ea91373e63 100644
--- a/plugins/RecentContacts/src/RecentContacts.cpp
+++ b/plugins/RecentContacts/src/RecentContacts.cpp
@@ -10,10 +10,10 @@ char *szProto;
HINSTANCE hInst = NULL;
int hLangpack = 0;
+CHAT_MANAGER *pci;
CLIST_INTERFACE *pcli;
HANDLE hTopToolbarButtonShowList;
HANDLE hMsgWndEvent;
-MWindowList hWindowList;
HGENMENU hMenuItemRemove;
const INT_PTR boo = 0;
@@ -57,14 +57,14 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
void LoadDBSettings()
{
memset(&LastUCOpt, 0, sizeof(LastUCOpt));
- LastUCOpt.MaxShownContacts = (INT)db_get_b( NULL, dbLastUC_ModuleName, dbLastUC_MaxShownContacts, 0 );
- LastUCOpt.HideOffline = db_get_b( NULL, dbLastUC_ModuleName, dbLastUC_HideOfflineContacts, 0 );
- LastUCOpt.WindowAutoSize = db_get_b( NULL, dbLastUC_ModuleName, dbLastUC_WindowAutosize, 0 );
+ LastUCOpt.MaxShownContacts = (INT)db_get_b(NULL, MODULENAME, dbLastUC_MaxShownContacts, 0);
+ LastUCOpt.HideOffline = db_get_b(NULL, MODULENAME, dbLastUC_HideOfflineContacts, 0);
+ LastUCOpt.WindowAutoSize = db_get_b(NULL, MODULENAME, dbLastUC_WindowAutosize, 0);
DBVARIANT dbv;
dbv.type = DBVT_ASCIIZ;
dbv.pszVal = NULL;
- if ( db_get(NULL, dbLastUC_ModuleName, dbLastUC_DateTimeFormat, &dbv) == 0 && dbv.pszVal[0]!=0 ) {
+ if (db_get(NULL, MODULENAME, dbLastUC_DateTimeFormat, &dbv) == 0 && dbv.pszVal[0] != 0) {
LastUCOpt.DateTimeFormat = dbv.pszVal;
db_free(&dbv);
}
@@ -87,7 +87,7 @@ void ShowListMainDlgProc_AdjustListPos(HWND hDlg, LASTUC_DLG_DATA *DlgDat)
rc.right = DlgDat->ListUCRect.right + cur.cx - DlgDat->WindowMinSize.cx;
rc.bottom = DlgDat->ListUCRect.bottom + cur.cy - DlgDat->WindowMinSize.cy;
MoveWindow(hList, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, TRUE);
-
+
LVCOLUMN lvc = { 0 };
lvc.mask = LVCF_WIDTH;
lvc.cx = rc.right - rc.left - GetSystemMetrics(SM_CYHSCROLL) - 4;
@@ -129,7 +129,7 @@ BOOL ShowListMainDlgProc_OpenContactMenu(HWND hDlg, HWND hList, int item, LASTUC
if (hCMenu != NULL) {
POINT p;
GetCursorPos(&p);
- DlgDat->hContact = (MCONTACT) lvi.lParam;
+ DlgDat->hContact = (MCONTACT)lvi.lParam;
BOOL ret = TrackPopupMenu(hCMenu, 0, p.x, p.y, 0, hDlg, NULL);
DestroyMenu(hCMenu);
if (ret)
@@ -144,7 +144,7 @@ BOOL ShowListMainDlgProc_OpenContactMenu(HWND hDlg, HWND hList, int item, LASTUC
void wSetData(char **Data, const char *Value)
{
if (Value[0] != 0) {
- char *newData = (char*)mir_alloc(mir_strlen(Value)+3);
+ char *newData = (char*)mir_alloc(mir_strlen(Value) + 3);
mir_strcpy(newData, Value);
*Data = newData;
}
@@ -161,14 +161,12 @@ HWND hwndContactTree = NULL;
INT_PTR CALLBACK ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
- LASTUC_DLG_DATA *DlgDat;
-
- DlgDat = (LASTUC_DLG_DATA *)GetWindowLongPtr(hDlg, GWLP_USERDATA);
+ LASTUC_DLG_DATA *DlgDat = (LASTUC_DLG_DATA *)GetWindowLongPtr(hDlg, GWLP_USERDATA);
HWND hList = GetDlgItem(hDlg, IDC_CONTACTS_LIST);
if (hList == NULL)
return FALSE;
- switch( msg ) {
+ switch (msg) {
case WM_INITDIALOG:
TranslateDialogDefault(hDlg);
{
@@ -195,10 +193,8 @@ INT_PTR CALLBACK ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
DlgDat->ListUCRect.bottom = p.y;
SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)DlgDat);
- //set listview styles
- ListView_SetExtendedListViewStyleEx(hList,
- LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES | LVS_EX_LABELTIP
- | LVS_EX_ONECLICKACTIVATE | LVS_EX_UNDERLINEHOT, -1);
+ // set listview styles
+ ListView_SetExtendedListViewStyleEx(hList, LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES | LVS_EX_LABELTIP | LVS_EX_ONECLICKACTIVATE | LVS_EX_UNDERLINEHOT, -1);
// add header columns to listview
LVCOLUMN lvc;
@@ -218,8 +214,7 @@ INT_PTR CALLBACK ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
LVITEM lvi = { 0 };
lvi.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE;
- int i=0;
- cmultimap::iterator curContact;
+ int i = 0;
std::wstring str;
char strtim[256 + 16];
@@ -227,16 +222,16 @@ INT_PTR CALLBACK ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
DBVARIANT dbv;
dbv.type = DBVT_ASCIIZ;
dbv.pszVal = NULL;
- if (db_get(NULL, dbLastUC_ModuleName, dbLastUC_DateTimeFormat, &dbv) == 0) {
+ if (db_get(NULL, MODULENAME, dbLastUC_DateTimeFormat, &dbv) == 0) {
strtimformat = dbv.pszVal;
db_free(&dbv);
}
else strtimformat = dbLastUC_DateTimeFormatDefault;
- for(curContact = DlgDat->Contacts->begin(); curContact != DlgDat->Contacts->end(); curContact++) {
- if (curContact->second != NULL && db_get_b(curContact->second, dbLastUC_ModuleName, dbLastUC_IgnoreContact, 0) == 0 ) {
- wchar_t *cname = ( wchar_t* )pcli->pfnGetContactDisplayName(curContact->second, 0);
- if ( cname == NULL )
+ for (auto curContact = DlgDat->Contacts->begin(); curContact != DlgDat->Contacts->end(); curContact++) {
+ if (curContact->second != NULL && db_get_b(curContact->second, MODULENAME, dbLastUC_IgnoreContact, 0) == 0) {
+ wchar_t *cname = (wchar_t*)pcli->pfnGetContactDisplayName(curContact->second, 0);
+ if (cname == NULL)
continue;
if (LastUCOpt.HideOffline == 1) {
@@ -248,7 +243,7 @@ INT_PTR CALLBACK ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
lvi.iItem = i;
lvi.iSubItem = 0;
lvi.lParam = (LPARAM)curContact->second;
-
+
strftime(strtim, 256, strtimformat.c_str(), _localtime64(&curContact->first));
strtim[255] = 0;
str = _A2T(strtim);
@@ -260,7 +255,7 @@ INT_PTR CALLBACK ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
}
if (LastUCOpt.MaxShownContacts > 0 && i >= LastUCOpt.MaxShownContacts)
- break;
+ break;
}
@@ -277,10 +272,10 @@ INT_PTR CALLBACK ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
char szSettingName[64];
mir_snprintf(szSettingName, "%swidth", dbLastUC_WindowPosPrefix);
- int width = db_get_dw(NULL, dbLastUC_ModuleName, szSettingName, -1);
+ int width = db_get_dw(NULL, MODULENAME, szSettingName, -1);
int right = rect.left - 6;
- if(!IsWindowVisible(pcli->hwndContactList)) right = rect.right;
+ if (!IsWindowVisible(pcli->hwndContactList)) right = rect.right;
wp.rcNormalPosition.left = right - width;
wp.rcNormalPosition.top = rect.top;
@@ -294,10 +289,9 @@ INT_PTR CALLBACK ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
}
if (restorePos)
- Utils_RestoreWindowPosition(hDlg, NULL, dbLastUC_ModuleName, dbLastUC_WindowPosPrefix);
+ Utils_RestoreWindowPosition(hDlg, NULL, MODULENAME, dbLastUC_WindowPosPrefix);
SendMessage(hDlg, WM_SIZE, 0, 0);
- WindowList_Add(hWindowList, hDlg, NULL);
return TRUE;
}
@@ -349,7 +343,7 @@ INT_PTR CALLBACK ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
if (Clist_MenuProcessCommand(LOWORD(wParam), MPCF_CONTACTMENU, DlgDat->hContact))
break;
- switch(wParam) {
+ switch (wParam) {
case IDOK:
ShowListMainDlgProc_OpenContact(hList, ListView_GetNextItem(hList, -1, LVIS_SELECTED));
case IDCANCEL:
@@ -360,7 +354,7 @@ INT_PTR CALLBACK ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
case WM_GETMINMAXINFO:
{
- MINMAXINFO *mmi = (MINMAXINFO *) lParam;
+ MINMAXINFO *mmi = (MINMAXINFO *)lParam;
mmi->ptMinTrackSize.x = 100;
mmi->ptMinTrackSize.y = 150;
return 0;
@@ -375,13 +369,10 @@ INT_PTR CALLBACK ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
break;
case WM_DESTROY:
- Utils_SaveWindowPosition(hDlg, NULL, dbLastUC_ModuleName, dbLastUC_WindowPosPrefix);
+ Utils_SaveWindowPosition(hDlg, NULL, MODULENAME, dbLastUC_WindowPosPrefix);
delete DlgDat->Contacts;
delete DlgDat;
-
- // Remove entry from Window list
- WindowList_Remove(hWindowList, hDlg);
break;
}
return FALSE;
@@ -391,20 +382,17 @@ INT_PTR OnMenuCommandShowList(WPARAM, LPARAM)
{
cmultimap *contacts = new cmultimap;
- __time64_t curTime;
- //DWORD t;
DBEVENTINFO dbe = {};
BYTE buf[1];
dbe.pBlob = buf;
- MEVENT curEvent;
-
+
for (MCONTACT curContact = db_find_first(); curContact != NULL; curContact = db_find_next(curContact)) {
- curTime = ((__time64_t)db_get_dw(curContact, dbLastUC_ModuleName, dbLastUC_LastUsedTimeLo, -1)) |
- (((__time64_t)db_get_dw(curContact, dbLastUC_ModuleName, dbLastUC_LastUsedTimeHi, -1)) << 32);
+ __time64_t curTime = ((__time64_t)db_get_dw(curContact, MODULENAME, dbLastUC_LastUsedTimeLo, -1)) |
+ (((__time64_t)db_get_dw(curContact, MODULENAME, dbLastUC_LastUsedTimeHi, -1)) << 32);
- curEvent = db_event_last(curContact);
+ MEVENT curEvent = db_event_last(curContact);
if (curEvent != NULL) {
- for ( ; curEvent != NULL; curEvent = db_event_prev(curContact, curEvent)) {
+ for (; curEvent != NULL; curEvent = db_event_prev(curContact, curEvent)) {
dbe.cbBlob = 1;
if (db_event_get(curEvent, &dbe) != 0) {
curEvent = NULL;
@@ -422,8 +410,8 @@ INT_PTR OnMenuCommandShowList(WPARAM, LPARAM)
contacts->insert(cpair(curTime, curContact));
}
- HWND hWndMain;
- if ((hWndMain = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_LASTUC_DIALOG), NULL, ShowListMainDlgProc, (LPARAM)contacts)) == NULL)
+ HWND hWndMain = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_LASTUC_DIALOG), NULL, ShowListMainDlgProc, (LPARAM)contacts);
+ if (hWndMain == NULL)
return -1;
ShowWindow(hWndMain, SW_SHOW);
@@ -433,11 +421,11 @@ INT_PTR OnMenuCommandShowList(WPARAM, LPARAM)
return 0;
}
-static int OnContactSettingChanged( WPARAM hContact, LPARAM lParam )
+static int OnContactSettingChanged(WPARAM hContact, LPARAM lParam)
{
- DBCONTACTWRITESETTING* pdbcws = ( DBCONTACTWRITESETTING* )lParam;
- if ( hContact == NULL )
- if ( !strcmp( pdbcws->szModule, dbLastUC_ModuleName))
+ DBCONTACTWRITESETTING *pdbcws = (DBCONTACTWRITESETTING*)lParam;
+ if (hContact == NULL)
+ if (!strcmp(pdbcws->szModule, MODULENAME))
LoadDBSettings();
return 0;
@@ -449,7 +437,7 @@ int Create_TopToolbarShowList(WPARAM, LPARAM)
ttb.hIconHandleUp = icon.hIcolib;
ttb.pszService = msLastUC_ShowList;
ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP;
- ttb.name = ttb.pszTooltipUp = msLastUC_ShowListName;
+ ttb.name = ttb.pszTooltipUp = LPGEN("Recent Contacts");
hTopToolbarButtonShowList = TopToolbar_AddButton(&ttb);
return 0;
}
@@ -459,7 +447,7 @@ int Create_MenuitemShowList(void)
CMenuItem mi;
SET_UID(mi, 0xe22ce213, 0x362a, 0x444a, 0xa5, 0x82, 0xc, 0xcf, 0xf5, 0x4b, 0xd1, 0x8e);
mi.hIcolibItem = icon.hIcolib;
- mi.name.a = msLastUC_ShowListName;
+ mi.name.a = LPGEN("Recent Contacts");
mi.pszService = msLastUC_ShowList;
Menu_AddMainMenuItem(&mi);
@@ -472,15 +460,36 @@ int Create_MenuitemShowList(void)
return 0;
}
-BOOL SaveLastUsedTimeStamp(MCONTACT hContact)
+static void SaveLastUsedTimeStamp(MCONTACT hContact)
{
__time64_t ct = _time64(NULL);
- db_set_dw(hContact, dbLastUC_ModuleName, dbLastUC_LastUsedTimeLo, (DWORD)ct);
- db_set_dw(hContact, dbLastUC_ModuleName, dbLastUC_LastUsedTimeHi, (DWORD)(ct >> 32));
- return TRUE;
+ db_set_dw(hContact, MODULENAME, dbLastUC_LastUsedTimeLo, (DWORD)ct);
+ db_set_dw(hContact, MODULENAME, dbLastUC_LastUsedTimeHi, (DWORD)(ct >> 32));
+}
+
+static int OnGCInEvent(WPARAM, LPARAM lParam)
+{
+ GCEVENT *gce = (GCEVENT*)lParam;
+ if (gce->pDest->iType == GC_EVENT_MESSAGE) {
+ SESSION_INFO *si = pci->SM_FindSession(gce->pDest->ptszID, gce->pDest->pszModule);
+ if (si && si->hContact)
+ SaveLastUsedTimeStamp(si->hContact);
+ }
+ return 0;
}
-int OnMsgEvent(WPARAM, LPARAM lParam)
+static int OnGCOutEvent(WPARAM, LPARAM lParam)
+{
+ GCEVENT *gce = (GCEVENT*)lParam;
+ if (gce->pDest->iType == GC_USER_MESSAGE) {
+ SESSION_INFO *si = pci->SM_FindSession(gce->pDest->ptszID, gce->pDest->pszModule);
+ if (si && si->hContact)
+ SaveLastUsedTimeStamp(si->hContact);
+ }
+ return 0;
+}
+
+static int OnMsgEvent(WPARAM, LPARAM lParam)
{
MessageWindowEventData *ed = (MessageWindowEventData *)lParam;
if (ed->hContact != 0 && ed->uType == MSG_WINDOW_EVT_OPEN)
@@ -488,7 +497,7 @@ int OnMsgEvent(WPARAM, LPARAM lParam)
return 0;
}
-int OnProtoBroadcast(WPARAM, LPARAM lParam)
+static int OnProtoBroadcast(WPARAM, LPARAM lParam)
{
ACKDATA *ack = (ACKDATA*)lParam;
if (ack->type == ACKTYPE_MESSAGE && ack->result == ACKRESULT_SUCCESS)
@@ -498,14 +507,14 @@ int OnProtoBroadcast(WPARAM, LPARAM lParam)
static int OnPrebuildContactMenu(WPARAM hContact, LPARAM)
{
- if (db_get_b(hContact, dbLastUC_ModuleName, dbLastUC_IgnoreContact, 0) == 0)
+ if (db_get_b(hContact, MODULENAME, dbLastUC_IgnoreContact, 0) == 0)
Menu_ModifyItem(hMenuItemRemove, LPGENW("Ignore Contact"));
else
Menu_ModifyItem(hMenuItemRemove, LPGENW("Show Contact"));
return 0;
}
-int OnModulesLoaded(WPARAM, LPARAM)
+static int OnModulesLoaded(WPARAM, LPARAM)
{
HookEvent(ME_TTB_MODULELOADED, Create_TopToolbarShowList);
@@ -523,11 +532,11 @@ int OnModulesLoaded(WPARAM, LPARAM)
return 0;
}
-INT_PTR ToggleIgnore (WPARAM hContact, LPARAM)
+static INT_PTR ToggleIgnore(WPARAM hContact, LPARAM)
{
if (hContact != NULL) {
- int state = db_get_b(hContact, dbLastUC_ModuleName, dbLastUC_IgnoreContact, 0) == 0 ? 1 : 0 ;
- db_set_b(hContact, dbLastUC_ModuleName, dbLastUC_IgnoreContact, state);
+ int state = db_get_b(hContact, MODULENAME, dbLastUC_IgnoreContact, 0) == 0 ? 1 : 0;
+ db_set_b(hContact, MODULENAME, dbLastUC_IgnoreContact, state);
return state;
}
@@ -538,21 +547,23 @@ INT_PTR ToggleIgnore (WPARAM hContact, LPARAM)
extern "C" __declspec(dllexport) int Load(void)
{
- mir_getLP( &pluginInfo );
+ mir_getLP(&pluginInfo);
pcli = Clist_GetInterface();
+ pci = Chat_GetInterface();
CoInitialize(NULL);
- hWindowList = WindowList_Create();
- Icon_Register(hInst, msLastUC_ShowListName, &icon, 1);
+ Icon_Register(hInst, "Recent Contacts", &icon, 1);
CreateServiceFunction(msLastUC_ShowList, OnMenuCommandShowList);
CreateServiceFunction(V_RECENTCONTACTS_TOGGLE_IGNORE, ToggleIgnore);
-
+
HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
HookEvent(ME_CLIST_PREBUILDCONTACTMENU, OnPrebuildContactMenu);
HookEvent(ME_MSG_WINDOWEVENT, OnMsgEvent);
- HookEvent(ME_DB_CONTACT_SETTINGCHANGED, OnContactSettingChanged );
+ HookEvent(ME_GC_HOOK_EVENT, OnGCInEvent);
+ HookEvent(ME_GC_EVENT, OnGCOutEvent);
+ HookEvent(ME_DB_CONTACT_SETTINGCHANGED, OnContactSettingChanged);
HookEvent(ME_OPT_INITIALISE, onOptInitialise);
HookEvent(ME_PROTO_ACK, OnProtoBroadcast);
return 0;
@@ -562,7 +573,6 @@ extern "C" __declspec(dllexport) int Load(void)
extern "C" __declspec(dllexport) int Unload(void)
{
- WindowList_Destroy(hWindowList);
CoUninitialize();
return 0;
}
diff --git a/plugins/RecentContacts/src/options.cpp b/plugins/RecentContacts/src/options.cpp
index f227f0534d..da67bff9bd 100644
--- a/plugins/RecentContacts/src/options.cpp
+++ b/plugins/RecentContacts/src/options.cpp
@@ -3,7 +3,7 @@
extern HINSTANCE hInst;
void LoadDBSettings();
-INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
char str[32];
@@ -33,27 +33,25 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
break;
case WM_NOTIFY:
- {
- LPNMHDR phdr = (LPNMHDR)(lParam);
- if (phdr->idFrom == 0 && phdr->code == PSN_APPLY) {
- LastUCOpt.HideOffline = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE);
- db_set_b(NULL, dbLastUC_ModuleName, dbLastUC_HideOfflineContacts, (BYTE)LastUCOpt.HideOffline);
+ LPNMHDR phdr = (LPNMHDR)(lParam);
+ if (phdr->idFrom == 0 && phdr->code == PSN_APPLY) {
+ LastUCOpt.HideOffline = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE);
+ db_set_b(NULL, MODULENAME, dbLastUC_HideOfflineContacts, (BYTE)LastUCOpt.HideOffline);
- LastUCOpt.WindowAutoSize = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_WINDOWAUTOSIZE);
- db_set_b(NULL, dbLastUC_ModuleName, dbLastUC_WindowAutosize, (BYTE)LastUCOpt.WindowAutoSize);
+ LastUCOpt.WindowAutoSize = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_WINDOWAUTOSIZE);
+ db_set_b(NULL, MODULENAME, dbLastUC_WindowAutosize, (BYTE)LastUCOpt.WindowAutoSize);
- GetDlgItemTextA(hwndDlg, IDC_SHOWNCONTACTS, str, _countof(str));
- LastUCOpt.MaxShownContacts= atoi(str);
- db_set_b(0,dbLastUC_ModuleName, dbLastUC_MaxShownContacts, LastUCOpt.MaxShownContacts);
+ GetDlgItemTextA(hwndDlg, IDC_SHOWNCONTACTS, str, _countof(str));
+ LastUCOpt.MaxShownContacts= atoi(str);
+ db_set_b(0,MODULENAME, dbLastUC_MaxShownContacts, LastUCOpt.MaxShownContacts);
- GetDlgItemTextA(hwndDlg, IDC_DATETIME, str, _countof(str));
- db_set_s(0,dbLastUC_ModuleName, dbLastUC_DateTimeFormat, str );
+ GetDlgItemTextA(hwndDlg, IDC_DATETIME, str, _countof(str));
+ db_set_s(0,MODULENAME, dbLastUC_DateTimeFormat, str );
- LoadDBSettings();
- return TRUE;
- }
- break;
+ LoadDBSettings();
+ return TRUE;
}
+ break;
}
return FALSE;
}
@@ -64,7 +62,7 @@ int onOptInitialise(WPARAM wParam, LPARAM)
odp.hInstance = hInst;
odp.szGroup.a = LPGEN("Contacts");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_LASTUC_OPT);
- odp.szTitle.a = msLastUC_ShowListName;
+ odp.szTitle.a = LPGEN("Recent Contacts");
odp.pfnDlgProc = DlgProcOptions;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/RecentContacts/src/stdafx.h b/plugins/RecentContacts/src/stdafx.h
index 58c438a5a2..a23ecfaacd 100644
--- a/plugins/RecentContacts/src/stdafx.h
+++ b/plugins/RecentContacts/src/stdafx.h
@@ -9,6 +9,7 @@
#include <newpluginapi.h>
#include <m_clist.h>
+#include <m_chat_int.h>
#include <m_langpack.h>
#include <m_database.h>
#include <m_message.h>
@@ -26,59 +27,47 @@
using namespace std;
+struct SESSION_INFO : public GCSessionInfoBase {};
+
void wSetData(char **Data, const char *Value);
void wfree(char **Data);
-static char msLastUC_ShowListName[] = LPGEN("Recent Contacts");
-
-static char dbLastUC_ModuleName[] = "RecentContacts";
-static char dbLastUC_LastUsedTimeLo[] = "LastUsedTimeLo";
-static char dbLastUC_LastUsedTimeHi[] = "LastUsedTimeHi";
-static char dbLastUC_WindowPosPrefix[] = "Window";
-static char dbLastUC_DateTimeFormat[] = "DateTimeFormat";
-static char dbLastUC_DateTimeFormatDefault[] = "(%Y-%m-%d %H:%M) ";
-static char dbLastUC_MaxShownContacts[] = "MaxShownContacts";
-static char dbLastUC_IgnoreContact[] = "Ignore";
-static char dbLastUC_HideOfflineContacts[] = "HideOfflineContacts";
-static char dbLastUC_WindowAutosize[] = "WindowAutoSize";
-
-static char msLastUC_ShowList[] = "RecentContacts/ShowList";
-static char msLastUC_IgnoreOff[] = "RecentContacts/SetIgnoreOff";
-static char msLastUC_IgnoreOn[] = "RecentContacts/SetIgnoreOn";
+#define MODULENAME "RecentContacts"
+#define dbLastUC_LastUsedTimeLo "LastUsedTimeLo"
+#define dbLastUC_LastUsedTimeHi "LastUsedTimeHi"
+#define dbLastUC_WindowPosPrefix "Window"
+#define dbLastUC_DateTimeFormat "DateTimeFormat"
+#define dbLastUC_DateTimeFormatDefault "(%Y-%m-%d %H:%M) "
+#define dbLastUC_MaxShownContacts "MaxShownContacts"
+#define dbLastUC_IgnoreContact "Ignore"
+#define dbLastUC_HideOfflineContacts "HideOfflineContacts"
+#define dbLastUC_WindowAutosize "WindowAutoSize"
+
+#define msLastUC_ShowList "RecentContacts/ShowList"
+#define msLastUC_IgnoreOff "RecentContacts/SetIgnoreOff"
+#define msLastUC_IgnoreOn "RecentContacts/SetIgnoreOn"
/////////////////////////////////////////////////////////////////////////////////////////
-typedef struct _LastUCOptions
+struct LastUCOptions
{
int MaxShownContacts;
int HideOffline;
int WindowAutoSize;
string DateTimeFormat;
-}
- LastUCOptions;
+};
extern LastUCOptions LastUCOpt;
-//#include "m_tabsrmm.h"
-// custom tabSRMM events
-#define tabMSG_WINDOW_EVT_CUSTOM_BEFORESEND 1
-struct TABSRMM_SessionInfo {
- unsigned int cbSize;
- unsigned int evtCode;
- HWND hwnd; // handle of the message dialog (tab)
- HWND hwndContainer; // handle of the parent container
- HWND hwndInput; // handle of the input area (rich edit)
- /*struct MessageWindowData*/ void *dat; // the session info
- /*struct ContainerWindowData*/ void *pContainer;
-};
+/////////////////////////////////////////////////////////////////////////////////////////
typedef std::multimap <__time64_t, MCONTACT, std::greater<__time64_t> > cmultimap;
typedef std::pair <__time64_t, MCONTACT> cpair;
-typedef struct LASTUC_DLG_DATA
+struct LASTUC_DLG_DATA
{
cmultimap *Contacts;
SIZE WindowMinSize;
RECT ListUCRect;
MCONTACT hContact;
-} LASTUC_DLG_DATA; \ No newline at end of file
+};
diff --git a/plugins/RecentContacts/src/version.h b/plugins/RecentContacts/src/version.h
index b951195e75..0ef410d93f 100644
--- a/plugins/RecentContacts/src/version.h
+++ b/plugins/RecentContacts/src/version.h
@@ -1,14 +1,14 @@
-#define __MAJOR_VERSION 0
-#define __MINOR_VERSION 0
-#define __RELEASE_NUM 2
-#define __BUILD_NUM 1
+#define __MAJOR_VERSION 0
+#define __MINOR_VERSION 1
+#define __RELEASE_NUM 0
+#define __BUILD_NUM 3
#include <stdver.h>
#define __PLUGIN_NAME "Recent contacts"
#define __FILENAME "RecentContacts.dll"
-#define __DESCRIPTION "Adds a menu item in main menu, which open the window with list of last used contacts names, sorted in order from most recent to least."
-#define __AUTHOR "ValeraVi, Kildor"
+#define __DESCRIPTION "Adds a menu item in main menu, which open the window with list of last used contacts names, sorted in order from most recent to least."
+#define __AUTHOR "ValeraVi, Kildor"
#define __AUTHOREMAIL "kostia@ngs.ru"
-#define __AUTHORWEB "http://miranda-ng.org/p/RecentContacts/"
-#define __COPYRIGHT "© 2005 ValeraVi, 2009 Kildor"
+#define __AUTHORWEB "http://miranda-ng.org/p/RecentContacts/"
+#define __COPYRIGHT "© 2005 ValeraVi, 2009 Kildor"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 07:29:49 +0000