From aa6ece5ae374ca814dab5df57e2180f404afdff6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 5 Apr 2018 21:16:06 +0300 Subject: bunch of obsoleted CLIST_INTERFACE::Tray* methods removed or moved to Clist_Tray* --- plugins/BossKeyPlus/src/BossKey.cpp | 2 +- plugins/Clist_blind/src/clistopts.cpp | 2 +- plugins/Clist_modern/src/modern_clc.cpp | 2 +- plugins/Clist_modern/src/modern_clcopts.cpp | 2 +- plugins/Clist_modern/src/modern_clisttray.cpp | 22 +++++++++++----------- plugins/Clist_modern/src/modern_clui.cpp | 9 +++++---- plugins/Clist_modern/src/modern_cluiservices.cpp | 2 +- plugins/Clist_nicer/src/clistopts.cpp | 2 +- plugins/Clist_nicer/src/clisttray.cpp | 22 +++++++++++----------- 9 files changed, 33 insertions(+), 32 deletions(-) (limited to 'plugins') diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index f5b7dfca1a..c2a35cafac 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -337,7 +337,7 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara } } - pcli->pfnTrayIconDestroy(pcli->hwndContactList); + Clist_TrayIconDestroy(pcli->hwndContactList); pcli->pfnUninitTray(); if (g_wMask & OPT_TRAYICON) diff --git a/plugins/Clist_blind/src/clistopts.cpp b/plugins/Clist_blind/src/clistopts.cpp index 040723c622..450ab84e49 100644 --- a/plugins/Clist_blind/src/clistopts.cpp +++ b/plugins/Clist_blind/src/clistopts.cpp @@ -162,7 +162,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP db_set_s(NULL, "CList", "PrimaryStatus", pa->szModuleName); } - pcli->pfnTrayIconIconsChanged(); + Clist_TrayIconIconsChanged(); Clist_LoadContactTree(); /* this won't do job properly since it only really works when changes happen */ pcli->pfnInvalidateDisplayNameCacheEntry(INVALID_CONTACT_ID); /* force reshuffle */ return TRUE; diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index 7cfbdaeddd..cbc887b625 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -1647,7 +1647,7 @@ int ClcDoProtoAck(ACKDATA *ack) if (!mir_strcmp(pcli->clcProto[i].szProto, ack->szModule)) { pcli->clcProto[i].dwStatus = (WORD)ack->lParam; if (pcli->clcProto[i].dwStatus >= ID_STATUS_OFFLINE) - pcli->pfnTrayIconUpdateBase(pcli->clcProto[i].szProto); + Clist_TrayIconUpdateBase(pcli->clcProto[i].szProto); return 0; } } diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index 9be0e4f3cd..911ce3553f 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -739,7 +739,7 @@ static INT_PTR CALLBACK DlgProcTrayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L | IsDlgButtonChecked(hwndDlg, IDC_ICON_CYCLE_V) << 2 | IsDlgButtonChecked(hwndDlg, IDC_ICON_ALL_V) << 3); - pcli->pfnTrayIconIconsChanged(); + Clist_TrayIconIconsChanged(); Clist_LoadContactTree(); /* this won't do job properly since it only really works when changes happen */ Clist_InitAutoRebuild(pcli->hwndContactTree); /* force reshuffle */ ClcOptionsChanged(); // Used to force loading avatar an list height related options diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp index 20ae2065a3..40e25870c9 100644 --- a/plugins/Clist_modern/src/modern_clisttray.cpp +++ b/plugins/Clist_modern/src/modern_clisttray.cpp @@ -322,7 +322,7 @@ int cliTrayIconInit(HWND hwnd) if (!pcli->trayIconCount) { pcli->trayIconCount = 1; pcli->trayIcon = (trayIconInfo_t*)mir_calloc(sizeof(trayIconInfo_t) * pcli->trayIconCount); - pcli->pfnTrayIconAdd(hwnd, nullptr, nullptr, CListTray_GetGlobalStatus(0, 0)); + Clist_TrayIconAdd(hwnd, nullptr, nullptr, CListTray_GetGlobalStatus(0, 0)); OldMode = TRAY_ICON_MODE_GLOBAL; return 0; } @@ -342,7 +342,7 @@ int cliTrayIconInit(HWND hwnd) // Добавляем иконки. switch (Mode) { case TRAY_ICON_MODE_GLOBAL: - pcli->pfnTrayIconAdd(hwnd, nullptr, nullptr, CListTray_GetGlobalStatus(0, 0)); + Clist_TrayIconAdd(hwnd, nullptr, nullptr, CListTray_GetGlobalStatus(0, 0)); break; case TRAY_ICON_MODE_ACC: @@ -353,14 +353,14 @@ int cliTrayIconInit(HWND hwnd) PROTOACCOUNT *pa = Proto_GetAccount(szProto); if (!pa || !pa->ppro) - pcli->pfnTrayIconAdd(hwnd, nullptr, nullptr, CListTray_GetGlobalStatus(0, 0)); + Clist_TrayIconAdd(hwnd, nullptr, nullptr, CListTray_GetGlobalStatus(0, 0)); else - pcli->pfnTrayIconAdd(hwnd, pa->szModuleName, nullptr, pa->ppro->m_iStatus); + Clist_TrayIconAdd(hwnd, pa->szModuleName, nullptr, pa->ppro->m_iStatus); } break; case TRAY_ICON_MODE_CYCLE: - pcli->pfnTrayIconAdd(hwnd, nullptr, nullptr, CListTray_GetGlobalStatus(0, 0)); + Clist_TrayIconAdd(hwnd, nullptr, nullptr, CListTray_GetGlobalStatus(0, 0)); pcli->cycleStep = 0; cliTrayCycleTimerProc(nullptr, 0, 0, 0); // force icon update // Не сохраняем ID таймера в pcli, чтобы fnTrayIconUpdateBase не убивала его. @@ -370,7 +370,7 @@ int cliTrayIconInit(HWND hwnd) case TRAY_ICON_MODE_ALL: for (auto &pa : Accounts().rev_iter()) if (pa->IsVisible() && pa->ppro != nullptr) - pcli->pfnTrayIconAdd(hwnd, pa->szModuleName, nullptr, pa->ppro->m_iStatus); + Clist_TrayIconAdd(hwnd, pa->szModuleName, nullptr, pa->ppro->m_iStatus); break; } @@ -395,7 +395,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int, int) BYTE Mode = db_get_b(0, "CList", (!bDiffers) ? "tiModeS" : "tiModeV", TRAY_ICON_MODE_GLOBAL); if (Mode != OldMode) { OldMode = Mode; - pcli->pfnTrayIconIconsChanged(); + Clist_TrayIconIconsChanged(); } HICON hIcon = nullptr; @@ -404,7 +404,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int, int) switch (Mode) { case TRAY_ICON_MODE_GLOBAL: hIcon = pcli->pfnGetIconFromStatusMode(0, nullptr, CListTray_GetGlobalStatus(0, 0)); - pcli->pfnTrayIconMakeTooltip(nullptr, nullptr); + Clist_TrayIconMakeTooltip(nullptr, nullptr); break; case TRAY_ICON_MODE_ACC: @@ -420,7 +420,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int, int) else hIcon = pcli->pfnGetIconFromStatusMode(0, szProto, CallProtoService(szProto, PS_GETSTATUS, 0, 0)); - pcli->pfnTrayIconMakeTooltip(nullptr, szProto); + Clist_TrayIconMakeTooltip(nullptr, szProto); } break; @@ -430,7 +430,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int, int) hIcon = (HICON)CLUI_GetConnectingIconService((WPARAM)szChangedProto, 0); else if (!bConn) hIcon = pcli->pfnGetIconFromStatusMode(0, szChangedProto, CallProtoService(szChangedProto, PS_GETSTATUS, 0, 0)); - pcli->pfnTrayIconMakeTooltip(nullptr, nullptr); + Clist_TrayIconMakeTooltip(nullptr, nullptr); break; case TRAY_ICON_MODE_ALL: @@ -444,7 +444,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int, int) hIcon = (HICON)CLUI_GetConnectingIconService((WPARAM)szChangedProto, 0); else hIcon = pcli->pfnGetIconFromStatusMode(0, szChangedProto, CallProtoService(szChangedProto, PS_GETSTATUS, 0, 0)); - pcli->pfnTrayIconMakeTooltip(nullptr, pcli->trayIcon[i].szProto); + Clist_TrayIconMakeTooltip(nullptr, pcli->trayIcon[i].szProto); break; } diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index 8ae724f4fb..6d3c0f0027 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -1211,8 +1211,9 @@ int CLUI_IconsChanged(WPARAM, LPARAM) DrawMenuBar(pcli->hwndContactList); ExtraIcon_Reload(); ExtraIcon_SetAll(); + // need to update tray cause it use combined icons - pcli->pfnTrayIconIconsChanged(); // TODO: remove as soon as core will include icolib + Clist_TrayIconIconsChanged(); // TODO: remove as soon as core will include icolib ske_RedrawCompleteWindow(); return 0; } @@ -1961,9 +1962,9 @@ LRESULT CLUI::OnStatusBarUpdateTimer(UINT msg, WPARAM wParam, LPARAM lParam) if (IsWindowVisible(pcli->hwndStatus)) pcli->pfnInvalidateRect(pcli->hwndStatus, nullptr, 0); if (pt->bGlobal) - pcli->pfnTrayIconUpdateBase(g_szConnectingProto); + Clist_TrayIconUpdateBase(g_szConnectingProto); else - pcli->pfnTrayIconUpdateBase(pt->szProto); + Clist_TrayIconUpdateBase(pt->szProto); pcli->pfnInvalidateRect(pcli->hwndStatus, nullptr, TRUE); return DefCluiWndProc(msg, wParam, lParam); @@ -2523,7 +2524,7 @@ LRESULT CLUI::OnDestroy(UINT, WPARAM, LPARAM) RemoveMenu(g_hMenuMain, 0, MF_BYPOSITION); DestroyMenu(g_hMenuMain); - pcli->pfnTrayIconDestroy(m_hWnd); + Clist_TrayIconDestroy(m_hWnd); mutex_bAnimationInProgress = 0; CallService(MS_CLIST_FRAMES_REMOVEFRAME, (WPARAM)hFrameContactTree, 0); TRACE("CLUI.c: WM_DESTROY - hFrameContactTree removed\n"); diff --git a/plugins/Clist_modern/src/modern_cluiservices.cpp b/plugins/Clist_modern/src/modern_cluiservices.cpp index 541a52cd78..ef14742cc7 100644 --- a/plugins/Clist_modern/src/modern_cluiservices.cpp +++ b/plugins/Clist_modern/src/modern_cluiservices.cpp @@ -36,7 +36,7 @@ void cliCluiProtocolStatusChanged(int, const char * proto) { CallService(MS_SKINENG_INVALIDATEFRAMEIMAGE, (WPARAM)pcli->hwndStatus, 0); if (proto) - pcli->pfnTrayIconUpdateBase(proto); + Clist_TrayIconUpdateBase(proto); } int CLUIServices_LoadModule(void) diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp index ff94f0b4c9..92b0e48002 100644 --- a/plugins/Clist_nicer/src/clistopts.cpp +++ b/plugins/Clist_nicer/src/clistopts.cpp @@ -165,7 +165,7 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP else db_set_s(NULL, "CList", "PrimaryStatus", pa->szModuleName); } - pcli->pfnTrayIconIconsChanged(); + Clist_TrayIconIconsChanged(); db_set_dw(NULL, "CLUI", "Frameflags", cfg::dat.dwFlags); ConfigureFrame(); ConfigureCLUIGeometry(1); diff --git a/plugins/Clist_nicer/src/clisttray.cpp b/plugins/Clist_nicer/src/clisttray.cpp index 441f7340c7..f17dcb99ba 100644 --- a/plugins/Clist_nicer/src/clisttray.cpp +++ b/plugins/Clist_nicer/src/clisttray.cpp @@ -42,39 +42,39 @@ int TrayCalcChanged(const char *szChangedProto, int averageMode, int netProtoCou if (db_get_b(NULL, "CList", "AlwaysMulti", SETTING_ALWAYSMULTI_DEFAULT)) { iIcon = IconFromStatusMode(szChangedProto, averageMode, 0, &hIcon); hIcon = (hIcon) ? CopyIcon(hIcon) : ImageList_GetIcon(hCListImages, iIcon, ILD_NORMAL); - return pcli->pfnTrayIconSetBaseInfo(hIcon, szChangedProto); + return Clist_TrayIconSetBaseInfo(hIcon, szChangedProto); } if (pcli->trayIcon == nullptr || pcli->trayIcon[0].szProto == nullptr) { iIcon = IconFromStatusMode(nullptr, averageMode, 0, &hIcon); hIcon = (hIcon) ? CopyIcon(hIcon) : ImageList_GetIcon(hCListImages, iIcon, ILD_NORMAL); - return pcli->pfnTrayIconSetBaseInfo(hIcon, nullptr); + return Clist_TrayIconSetBaseInfo(hIcon, nullptr); } - pcli->pfnTrayIconDestroy(hwnd); + Clist_TrayIconDestroy(hwnd); pcli->pfnTrayIconInit(hwnd); } else { iIcon = IconFromStatusMode(nullptr, averageMode, 0, &hIcon); hIcon = (hIcon) ? CopyIcon(hIcon) : ImageList_GetIcon(hCListImages, iIcon, ILD_NORMAL); - return pcli->pfnTrayIconSetBaseInfo(hIcon, nullptr); + return Clist_TrayIconSetBaseInfo(hIcon, nullptr); } } else { switch (db_get_b(NULL, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT)) { case SETTING_TRAYICON_CYCLE: + Clist_TraySetTimer(); iIcon = IconFromStatusMode(szChangedProto, CallProtoService(szChangedProto, PS_GETSTATUS, 0, 0), 0, &hIcon); - pcli->cycleTimerId = SetTimer(nullptr, 0, db_get_w(NULL, "CList", "CycleTime", SETTING_CYCLETIME_DEFAULT) * 1000, pcli->pfnTrayCycleTimerProc); hIcon = (hIcon) ? CopyIcon(hIcon) : ImageList_GetIcon(hCListImages, iIcon, ILD_NORMAL); - return pcli->pfnTrayIconSetBaseInfo(hIcon, nullptr); + return Clist_TrayIconSetBaseInfo(hIcon, nullptr); case SETTING_TRAYICON_MULTI: if (!pcli->trayIcon) - pcli->pfnTrayIconRemove(nullptr, nullptr); + Clist_TrayIconRemove(nullptr, nullptr); else if (db_get_b(NULL, "CList", "AlwaysMulti", SETTING_ALWAYSMULTI_DEFAULT)) { iIcon = IconFromStatusMode(szChangedProto, CallProtoService(szChangedProto, PS_GETSTATUS, 0, 0), 0, &hIcon); hIcon = (hIcon) ? CopyIcon(hIcon) : ImageList_GetIcon(hCListImages, iIcon, ILD_NORMAL); - return pcli->pfnTrayIconSetBaseInfo(hIcon, szChangedProto); + return Clist_TrayIconSetBaseInfo(hIcon, szChangedProto); } - pcli->pfnTrayIconDestroy(hwnd); + Clist_TrayIconDestroy(hwnd); pcli->pfnTrayIconInit(hwnd); break; @@ -82,14 +82,14 @@ int TrayCalcChanged(const char *szChangedProto, int averageMode, int netProtoCou ptrA szProto(db_get_sa(NULL, "CList", "PrimaryStatus")); iIcon = IconFromStatusMode(szProto, szProto ? CallProtoService(szProto, PS_GETSTATUS, 0, 0) : CallService(MS_CLIST_GETSTATUSMODE, 0, 0), 0, &hIcon); hIcon = (hIcon) ? CopyIcon(hIcon) : ImageList_GetIcon(hCListImages, iIcon, ILD_NORMAL); - return pcli->pfnTrayIconSetBaseInfo(hIcon, nullptr); + return Clist_TrayIconSetBaseInfo(hIcon, nullptr); } } } else { iIcon = IconFromStatusMode(nullptr, averageMode, 0, &hIcon); hIcon = (hIcon) ? CopyIcon(hIcon) : ImageList_GetIcon(hCListImages, iIcon, ILD_NORMAL); - return pcli->pfnTrayIconSetBaseInfo(hIcon, nullptr); + return Clist_TrayIconSetBaseInfo(hIcon, nullptr); } return -1; -- cgit v1.2.3