summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/delphi/m_clistint.inc2
-rw-r--r--include/m_clistint.h3
-rw-r--r--libs/win32/mir_app.libbin153082 -> 153362 bytes
-rw-r--r--libs/win64/mir_app.libbin148354 -> 148614 bytes
-rw-r--r--plugins/Clist_modern/src/modern_clc.cpp11
-rw-r--r--plugins/Clist_modern/src/modern_viewmodebar.cpp14
-rw-r--r--src/mir_app/src/clc.cpp2
-rw-r--r--src/mir_app/src/clc.h3
-rw-r--r--src/mir_app/src/clcutils.cpp4
-rw-r--r--src/mir_app/src/clistcore.cpp3
-rw-r--r--src/mir_app/src/mir_app.def1
-rw-r--r--src/mir_app/src/mir_app64.def1
12 files changed, 28 insertions, 16 deletions
diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index a9cb0ea06e..d54098f610 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -348,7 +348,7 @@ type
pfnDoSelectionDefaultAction : procedure (hwnd:HWND; var dat:TClcData); cdecl;
pfnFindRowByText : function (hwnd:HWND; var dat:TClcData; text:TChar; prefixOk:int):int; cdecl;
pfnEndRename : procedure (hwnd:HWND; var dat:TClcData; save:int); cdecl;
- pfnDeleteFromContactList : procedure (hwnd:HWND; var dat:TClcData); cdecl;
+ blablablabla15 : procedure; cdecl;
pfnBeginRenameSelection : procedure (hwnd:HWND; var dat:TClcData); cdecl;
blablablabla14 : procedure; cdecl;
blablablabla13 : procedure; cdecl;
diff --git a/include/m_clistint.h b/include/m_clistint.h
index f86d64f6f5..6fd8a435a4 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -254,6 +254,7 @@ EXTERN_C MIR_APP_DLL(void) Clist_BroadcastAsync(int msg, WPARAM wParam, LPAR
EXTERN_C MIR_APP_DLL(void) Clist_ChangeContactIcon(MCONTACT hContact, int iIcon);
EXTERN_C MIR_APP_DLL(int) Clist_ClcStatusToPf2(int status);
+EXTERN_C MIR_APP_DLL(void) Clist_DeleteFromContactList(HWND hwnd, ClcData *dat);
EXTERN_C MIR_APP_DLL(void) Clist_DrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, HICON eventIcon);
EXTERN_C MIR_APP_DLL(int) Clist_EventsProcessTrayDoubleClick(int index);
EXTERN_C MIR_APP_DLL(bool) Clist_FindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);
@@ -365,7 +366,7 @@ struct CLIST_INTERFACE
void (*pfnDoSelectionDefaultAction)(HWND hwnd, ClcData *dat);
int (*pfnFindRowByText)(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk);
void (*pfnEndRename)(HWND hwnd, ClcData *dat, int save);
- void (*pfnDeleteFromContactList)(HWND hwnd, ClcData *dat);
+ void (*blablablabla15)();
void (*pfnBeginRenameSelection)(HWND hwnd, ClcData *dat);
void (*blablablabla14)();
void (*blablablabla13)();
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 6bb497fb9f..83b0f07529 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
Binary files differ
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index b332c8db6b..724c17b4fd 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
Binary files differ
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index abce896da1..8bbd3bb437 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -451,8 +451,15 @@ static LRESULT clcOnKeyDown(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM
SetCapture(hwnd);
return 0;
- case VK_F2: cliBeginRenameSelection(hwnd, dat); /*SetCapture(hwnd);*/ return 0;
- case VK_DELETE: pcli->pfnDeleteFromContactList(hwnd, dat); SetCapture(hwnd); return 0;
+ case VK_F2:
+ cliBeginRenameSelection(hwnd, dat);
+ return 0;
+
+ case VK_DELETE:
+ Clist_DeleteFromContactList(hwnd, dat);
+ SetCapture(hwnd);
+ return 0;
+
case VK_ESCAPE:
if ((dat->dragStage & DRAGSTAGEM_STAGE) == DRAGSTAGE_ACTIVE) {
dat->iDragItem = -1;
diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index 78baf5a889..fdb8027a3b 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -208,12 +208,14 @@ static int FillDialog(HWND hwnd)
ListView_InsertColumn(GetDlgItem(hwnd, IDC_PROTOCOLS), 0, &lvc);
// fill protocols...
- LVITEMA item = { 0 };
- item.mask = LVIF_TEXT;
- item.iItem = 1000;
- for (auto &pa : Accounts()) {
- item.pszText = pa->szModuleName;
- SendMessageA(hwndList, LVM_INSERTITEMA, 0, (LPARAM)&item);
+ {
+ LVITEMA item = { 0 };
+ item.mask = LVIF_TEXT;
+ item.iItem = 1000;
+ for (auto &pa : Accounts()) {
+ item.pszText = pa->szModuleName;
+ SendMessageA(hwndList, LVM_INSERTITEMA, 0, (LPARAM)&item);
+ }
}
ListView_SetColumnWidth(hwndList, 0, LVSCW_AUTOSIZE);
diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp
index 7f51e96655..a39309ef12 100644
--- a/src/mir_app/src/clc.cpp
+++ b/src/mir_app/src/clc.cpp
@@ -706,7 +706,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
return 0;
case VK_F2: cli.pfnBeginRenameSelection(hwnd, dat); return 0;
- case VK_DELETE: cli.pfnDeleteFromContactList(hwnd, dat); return 0;
+ case VK_DELETE: Clist_DeleteFromContactList(hwnd, dat); return 0;
default:
NMKEY nmkey;
diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h
index aaad1821d6..3889fd56aa 100644
--- a/src/mir_app/src/clc.h
+++ b/src/mir_app/src/clc.h
@@ -84,9 +84,8 @@ void fnSetGroupExpand(HWND hwnd, ClcData *dat, ClcGroup *group, int newState);
void fnDoSelectionDefaultAction(HWND hwnd, ClcData *dat);
int fnFindRowByText(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk);
void fnEndRename(HWND hwnd, ClcData *dat, int save);
-void fnDeleteFromContactList(HWND hwnd, ClcData *dat);
-void fnBeginRenameSelection(HWND hwnd, ClcData *dat);
+void fnBeginRenameSelection(HWND hwnd, ClcData *dat);
void fnGetDefaultFontSetting(int i, LOGFONT *lf, COLORREF *colour);
void fnLoadClcOptions(HWND hwnd, ClcData *dat, BOOL bFirst);
void fnSetContactCheckboxes(ClcContact *cc, int checked);
diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp
index db1c428865..79ed8b3af9 100644
--- a/src/mir_app/src/clcutils.cpp
+++ b/src/mir_app/src/clcutils.cpp
@@ -449,14 +449,16 @@ void fnEndRename(HWND, ClcData *dat, int save)
DestroyWindow(hwndEdit);
}
-void fnDeleteFromContactList(HWND hwnd, ClcData *dat)
+MIR_APP_DLL(void) Clist_DeleteFromContactList(HWND hwnd, ClcData *dat)
{
ClcContact *contact;
if (dat->selection == -1)
return;
+
dat->szQuickSearch[0] = 0;
if (cli.pfnGetRowByIndex(dat, dat->selection, &contact, nullptr) == -1)
return;
+
switch (contact->type) {
case CLCIT_GROUP:
Clist_GroupDelete(contact->groupId);
diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index ebc853fcf0..a7f1bc9572 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -101,9 +101,8 @@ void InitClistCore()
cli.pfnDoSelectionDefaultAction = fnDoSelectionDefaultAction;
cli.pfnFindRowByText = fnFindRowByText;
cli.pfnEndRename = fnEndRename;
- cli.pfnDeleteFromContactList = fnDeleteFromContactList;
+
cli.pfnBeginRenameSelection = fnBeginRenameSelection;
-
cli.pfnIsVisibleContact = fnIsVisibleContact;
cli.pfnGetDefaultFontSetting = fnGetDefaultFontSetting;
cli.pfnLoadClcOptions = fnLoadClcOptions;
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 34b277c764..e999a3c97d 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -567,3 +567,4 @@ Clist_HideInfoTip @586
Clist_IsHiddenMode @587
Clist_ClcStatusToPf2 @588
Clist_CalcEipPosition @589
+Clist_DeleteFromContactList @590
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 2d23da50be..bc5d92f576 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -567,3 +567,4 @@ Clist_HideInfoTip @586
Clist_IsHiddenMode @587
Clist_ClcStatusToPf2 @588
Clist_CalcEipPosition @589
+Clist_DeleteFromContactList @590
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 02:22:36 +0000