diff options
| -rw-r--r-- | plugins/ContactsPlus/src/send.cpp | 2 | ||||
| -rw-r--r-- | plugins/Ping/src/pingthread.cpp | 20 | ||||
| -rw-r--r-- | plugins/Popup/src/opt_adv.cpp | 2 | ||||
| -rw-r--r-- | plugins/ShellExt/src/shlcom.cpp | 4 | ||||
| -rw-r--r-- | plugins/StopSpamMod/src/utilities.cpp | 2 | ||||
| -rw-r--r-- | plugins/TooltipNotify/src/TooltipNotify.cpp | 2 | ||||
| -rw-r--r-- | plugins/TrafficCounter/src/TrafficCounter.cpp | 2 |
7 files changed, 17 insertions, 17 deletions
diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp index 0ba2732d43..b617780031 100644 --- a/plugins/ContactsPlus/src/send.cpp +++ b/plugins/ContactsPlus/src/send.cpp @@ -200,7 +200,7 @@ static void SetAllContactChecks(HWND hwndList, MCONTACT hReceiver) // doubtful n if (szProto == nullptr)
return;
- SendMessage(hwndList, CLM_SETHIDEEMPTYGROUPS, Clist::HideEmptyGroups, 0);
+ SendMessage(hwndList, CLM_SETHIDEEMPTYGROUPS, Clist::bHideEmptyGroups, 0);
MCONTACT hItem, hContact = FindFirstClistContact(hwndList, &hItem);
while (hContact) {
diff --git a/plugins/Ping/src/pingthread.cpp b/plugins/Ping/src/pingthread.cpp index f8ad707c81..f2682f0715 100644 --- a/plugins/Ping/src/pingthread.cpp +++ b/plugins/Ping/src/pingthread.cpp @@ -465,7 +465,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar }
else {
SetWindowLongPtr(hwnd, GWL_EXSTYLE, GetWindowLongPtr(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED);
- SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (uint8_t)db_get_b(0, "CList", "Alpha", SETTING_ALPHA_DEFAULT), LWA_ALPHA);
+ SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), Clist::iAlpha, LWA_ALPHA);
}
}
@@ -479,23 +479,23 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar case WM_ACTIVATE:
if (wParam == WA_INACTIVE) {
if ((HWND)wParam != hwnd)
- if (db_get_b(0, "CList", "Transparent", SETTING_TRANSPARENT_DEFAULT))
+ if (Clist::bTransparent)
if (transparentFocus)
SetTimer(hwnd, TM_AUTOALPHA, 250, nullptr);
}
else {
- if (db_get_b(0, "CList", "Transparent", SETTING_TRANSPARENT_DEFAULT)) {
+ if (Clist::bTransparent) {
KillTimer(hwnd, TM_AUTOALPHA);
- SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (uint8_t)db_get_b(0, "CList", "Alpha", SETTING_ALPHA_DEFAULT), LWA_ALPHA);
+ SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), Clist::iAlpha, LWA_ALPHA);
transparentFocus = 1;
}
}
return DefWindowProc(hwnd, msg, wParam, lParam);
case WM_SETCURSOR:
- if (db_get_b(0, "CList", "Transparent", SETTING_TRANSPARENT_DEFAULT)) {
+ if (Clist::bTransparent) {
if (!transparentFocus && GetForegroundWindow() != hwnd) {
- SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (uint8_t)db_get_b(0, "CList", "Alpha", SETTING_ALPHA_DEFAULT), LWA_ALPHA);
+ SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), Clist::iAlpha, LWA_ALPHA);
transparentFocus = 1;
SetTimer(hwnd, TM_AUTOALPHA, 250, nullptr);
}
@@ -521,9 +521,9 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar if (inwnd != transparentFocus) { //change
transparentFocus = inwnd;
if (transparentFocus)
- SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (uint8_t)db_get_b(0, "CList", "Alpha", SETTING_ALPHA_DEFAULT), LWA_ALPHA);
+ SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), Clist::iAlpha, LWA_ALPHA);
else
- SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (uint8_t)db_get_b(0, "CList", "AutoAlpha", SETTING_AUTOALPHA_DEFAULT), LWA_ALPHA);
+ SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), Clist::iAutoAlpha, LWA_ALPHA);
}
if (!transparentFocus) KillTimer(hwnd, TM_AUTOALPHA);
return TRUE;
@@ -543,14 +543,14 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar int sourceAlpha, destAlpha;
if (wParam) {
sourceAlpha = 0;
- destAlpha = (uint8_t)db_get_b(0, "CList", "Alpha", SETTING_AUTOALPHA_DEFAULT);
+ destAlpha = Clist::iAlpha;
SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), 0, LWA_ALPHA);
noRecurse = 1;
ShowWindow(hwnd, SW_SHOW);
noRecurse = 0;
}
else {
- sourceAlpha = (uint8_t)db_get_b(0, "CList", "Alpha", SETTING_AUTOALPHA_DEFAULT);
+ sourceAlpha = Clist::iAlpha;
destAlpha = 0;
}
for (startTick = GetTickCount();;) {
diff --git a/plugins/Popup/src/opt_adv.cpp b/plugins/Popup/src/opt_adv.cpp index 776fa2b6b2..2b97bbe5a0 100644 --- a/plugins/Popup/src/opt_adv.cpp +++ b/plugins/Popup/src/opt_adv.cpp @@ -62,7 +62,7 @@ void LoadOption_AdvOpts() // Transparency
PopupOptions.bUseTransparency = g_plugin.getBool("UseTransparency", true);
- PopupOptions.Alpha = g_plugin.getByte("Alpha", SETTING_ALPHA_DEFAULT);
+ PopupOptions.Alpha = Clist::iAlpha;
PopupOptions.bOpaqueOnHover = g_plugin.getBool("OpaqueOnHover", true);
// Effects
diff --git a/plugins/ShellExt/src/shlcom.cpp b/plugins/ShellExt/src/shlcom.cpp index c27ff9cfdb..8e8314ddd4 100644 --- a/plugins/ShellExt/src/shlcom.cpp +++ b/plugins/ShellExt/src/shlcom.cpp @@ -236,7 +236,7 @@ void ipcGetSkinIcons(THeaderIPC * ipch) bool ipcGetSortedContacts(THeaderIPC * ipch, int* pSlot, bool bGroupMode)
{
// hide offliners?
- bool bHideOffline = Clist::HideOffline;
+ bool bHideOffline = Clist::bHideOffline;
// do they wanna hide the offline people anyway?
if (g_plugin.getByte(SHLExt_ShowNoOffline, 0) == 1)
// hide offline people
@@ -409,7 +409,7 @@ void __stdcall ipcService(ULONG_PTR) // if the group mode is on, check if they want the CList setting
bool bGroupMode = (BST_CHECKED == g_plugin.getByte(SHLExt_UseGroups, BST_UNCHECKED));
if (bGroupMode && BST_CHECKED == g_plugin.getByte(SHLExt_UseCListSetting, BST_UNCHECKED))
- bGroupMode = Clist::UseGroups;
+ bGroupMode = Clist::bUseGroups;
TSlotIPC * pct = nullptr;
int iSlot = 0;
diff --git a/plugins/StopSpamMod/src/utilities.cpp b/plugins/StopSpamMod/src/utilities.cpp index 7de5e6b749..aafcd0c285 100644 --- a/plugins/StopSpamMod/src/utilities.cpp +++ b/plugins/StopSpamMod/src/utilities.cpp @@ -67,7 +67,7 @@ bool ProtoInList(const char *szProto) void DeleteCListGroupsByName(wchar_t *szGroupName)
{
- uint8_t ConfirmDelete = Clist::ConfirmDelete;
+ uint8_t ConfirmDelete = Clist::bConfirmDelete;
if (ConfirmDelete)
db_set_b(0, "CList", "ConfirmDelete", 0);
diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp index 0bbd200e69..0c55dbc828 100644 --- a/plugins/TooltipNotify/src/TooltipNotify.cpp +++ b/plugins/TooltipNotify/src/TooltipNotify.cpp @@ -691,7 +691,7 @@ BOOL CTooltipNotify::ProtosDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM) void CTooltipNotify::ResetCList(HWND hwndDlg)
{
- SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETUSEGROUPS, Clist::UseGroups, 0);
+ SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETUSEGROUPS, Clist::bUseGroups, 0);
SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETHIDEEMPTYGROUPS, 1, 0);
}
diff --git a/plugins/TrafficCounter/src/TrafficCounter.cpp b/plugins/TrafficCounter/src/TrafficCounter.cpp index c4931fb019..a117eaabde 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.cpp +++ b/plugins/TrafficCounter/src/TrafficCounter.cpp @@ -626,7 +626,7 @@ LRESULT CALLBACK TrafficCounterWndProc_MW(HWND hwnd, UINT msg, WPARAM wParam, LP return 1;
case WM_LBUTTONDOWN:
- if (db_get_b(0, "CLUI", "ClientAreaDrag", SETTING_CLIENTDRAG_DEFAULT)) {
+ if (Clist::bClientAreaDrag) {
POINT p;
ClientToScreen(GetParent(hwnd), &p);
return SendMessage(GetParent(hwnd), WM_SYSCOMMAND, SC_MOVE | HTCAPTION, MAKELPARAM(p.x, p.y));
|
