summaryrefslogtreecommitdiff
path: root/src/core/stdchat
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/stdchat')
-rw-r--r--src/core/stdchat/src/chat.h2
-rw-r--r--src/core/stdchat/src/main.cpp20
-rw-r--r--src/core/stdchat/src/options.cpp40
-rw-r--r--src/core/stdchat/src/services.cpp2
-rw-r--r--src/core/stdchat/src/window.cpp42
5 files changed, 53 insertions, 53 deletions
diff --git a/src/core/stdchat/src/chat.h b/src/core/stdchat/src/chat.h
index c5e3472401..cf157efb7d 100644
--- a/src/core/stdchat/src/chat.h
+++ b/src/core/stdchat/src/chat.h
@@ -97,7 +97,7 @@ struct LOGSTREAMDATA : public GCLogStreamDataBase {};
struct GlobalLogSettings : public GlobalLogSettingsBase
{
int iX, iY;
- bool TabsEnable, TabsAtBottom, TabCloseOnDblClick, TabRestore;
+ bool bTabsEnable, TabsAtBottom, TabCloseOnDblClick, TabRestore;
};
extern GlobalLogSettings g_Settings;
diff --git a/src/core/stdchat/src/main.cpp b/src/core/stdchat/src/main.cpp
index d1fc7f764d..1bda6ebd07 100644
--- a/src/core/stdchat/src/main.cpp
+++ b/src/core/stdchat/src/main.cpp
@@ -114,7 +114,7 @@ static void OnClearLog(SESSION_INFO *si)
static void OnSessionDblClick(SESSION_INFO *si)
{
- if (g_Settings.TabsEnable)
+ if (g_Settings.bTabsEnable)
SendMessage(si->hWnd, GC_REMOVETAB, 1, (LPARAM)si);
else
PostMessage(si->hWnd, GC_CLOSEWINDOW, 0, 0);
@@ -122,7 +122,7 @@ static void OnSessionDblClick(SESSION_INFO *si)
static void OnSessionRemove(SESSION_INFO *si)
{
- if (!g_Settings.TabsEnable) {
+ if (!g_Settings.bTabsEnable) {
if (si->hWnd)
SendMessage(si->hWnd, GC_EVENT_CONTROL + WM_USER + 500, SESSION_TERMINATE, 0);
}
@@ -135,7 +135,7 @@ static void OnSessionRemove(SESSION_INFO *si)
static void OnSessionRename(SESSION_INFO *si)
{
- if (g_TabSession.hWnd && g_Settings.TabsEnable) {
+ if (g_TabSession.hWnd && g_Settings.bTabsEnable) {
g_TabSession.ptszName = si->ptszName;
SendMessage(g_TabSession.hWnd, GC_SESSIONNAMECHANGE, 0, (LPARAM)si);
}
@@ -146,7 +146,7 @@ static void OnSessionReplace(SESSION_INFO *si)
if (si->hWnd)
g_TabSession.nUsersInNicklist = 0;
- if (!g_Settings.TabsEnable) {
+ if (!g_Settings.bTabsEnable) {
if (si->hWnd)
RedrawWindow(GetDlgItem(si->hWnd, IDC_LIST), NULL, NULL, RDW_INVALIDATE);
}
@@ -158,7 +158,7 @@ static void OnSessionOffline(SESSION_INFO *si)
{
if (si->hWnd) {
g_TabSession.nUsersInNicklist = 0;
- if (g_Settings.TabsEnable)
+ if (g_Settings.bTabsEnable)
g_TabSession.pUsers = 0;
}
}
@@ -209,13 +209,13 @@ static void OnRemoveUser(SESSION_INFO *si, USERINFO*)
static void OnAddStatus(SESSION_INFO *si, STATUSINFO*)
{
- if (g_Settings.TabsEnable && si->hWnd)
+ if (g_Settings.bTabsEnable && si->hWnd)
g_TabSession.pStatuses = si->pStatuses;
}
static void OnSetStatus(SESSION_INFO *si, int wStatus)
{
- if (g_Settings.TabsEnable) {
+ if (g_Settings.bTabsEnable) {
if (si->hWnd)
g_TabSession.wStatus = wStatus;
if (g_TabSession.hWnd)
@@ -234,9 +234,9 @@ static void OnFlashWindow(SESSION_INFO *si, int bInactive)
if (!bInactive)
return;
- if (!g_Settings.TabsEnable && si->hWnd && db_get_b(NULL, "Chat", "FlashWindowHighlight", 0) != 0)
+ if (!g_Settings.bTabsEnable && si->hWnd && g_Settings.bFlashWindowHighlight)
SetTimer(si->hWnd, TIMERID_FLASHWND, 900, NULL);
- if (g_Settings.TabsEnable && g_TabSession.hWnd)
+ if (g_Settings.bTabsEnable && g_TabSession.hWnd)
SendMessage(g_TabSession.hWnd, GC_SETMESSAGEHIGHLIGHT, 0, (LPARAM)si);
}
@@ -259,7 +259,7 @@ static void OnLoadSettings()
g_Settings.iX = db_get_dw(NULL, "Chat", "roomx", -1);
g_Settings.iY = db_get_dw(NULL, "Chat", "roomy", -1);
- g_Settings.TabsEnable = db_get_b(NULL, "Chat", "Tabs", 1) != 0;
+ g_Settings.bTabsEnable = db_get_b(NULL, "Chat", "Tabs", 1) != 0;
g_Settings.TabRestore = db_get_b(NULL, "Chat", "TabRestore", 0) != 0;
g_Settings.TabsAtBottom = db_get_b(NULL, "Chat", "TabBottom", 0) != 0;
g_Settings.TabCloseOnDblClick = db_get_b(NULL, "Chat", "TabCloseOnDblClick", 0) != 0;
diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp
index f643253b81..326d253369 100644
--- a/src/core/stdchat/src/options.cpp
+++ b/src/core/stdchat/src/options.cpp
@@ -40,7 +40,7 @@ static const struct branch_t branch1[] = {
{ LPGENT("Send message by pressing the 'Enter' key"), "SendOnEnter", 0, 1},
{ LPGENT("Send message by pressing the 'Enter' key twice"), "SendOnDblEnter", 0,0},
{ LPGENT("Flash window when someone speaks"), "FlashWindow", 0,0},
- { LPGENT("Flash window when a word is highlighted"), "FlashWindowHighlight", 0,1},
+ { LPGENT("Flash window when a word is highlighted"), "bFlashWindowHighlight", 0,1},
{ LPGENT("Show list of users in the chat room"), "ShowNicklist", 0,1},
{ LPGENT("Show button for sending messages"), "ShowSend", 0, 0},
{ LPGENT("Show buttons for controlling the chat room"), "ShowTopButtons", 0,1},
@@ -59,9 +59,9 @@ static const struct branch_t branch1[] = {
static const struct branch_t branch2[] = {
{ LPGENT("Prefix all events with a timestamp"), "ShowTimeStamp", 0,1},
{ LPGENT("Only prefix with timestamp if it has changed"), "ShowTimeStampIfChanged", 0,0},
- { LPGENT("Timestamp has same color as the event"), "TimeStampEventColour", 0,0},
- { LPGENT("Indent the second line of a message"), "LogIndentEnabled", 0,1},
- { LPGENT("Limit user names in the message log to 20 characters"), "LogLimitNames", 0,1},
+ { LPGENT("Timestamp has same color as the event"), "bTimeStampEventColour", 0,0},
+ { LPGENT("Indent the second line of a message"), "bLogIndentEnabled", 0,1},
+ { LPGENT("Limit user names in the message log to 20 characters"), "bLogLimitNames", 0,1},
{ LPGENT("Add \':\' to auto-completed user names"), "AddColonToAutoComplete", 0, 1},
{ LPGENT("Strip colors from messages in the log"), "StripFormatting", 0, 0},
{ LPGENT("Enable the \'event filter\' for new rooms"), "FilterEnabled", 0,0}
@@ -97,7 +97,7 @@ static const struct branch_t branch4[] = {
};
static const struct branch_t branch5[] = {
- { LPGENT("Show icons in tray only when the chat room is not active"), "TrayIconInactiveOnly", 0, 1},
+ { LPGENT("Show icons in tray only when the chat room is not active"), "bTrayIconInactiveOnly", 0, 1},
{ LPGENT("Show icon in tray for topic changes"), "TrayIconFlags", GC_EVENT_TOPIC, 0},
{ LPGENT("Show icon in tray for users joining"), "TrayIconFlags", GC_EVENT_JOIN, 0},
{ LPGENT("Show icon in tray for users disconnecting"), "TrayIconFlags", GC_EVENT_QUIT, 0},
@@ -423,14 +423,14 @@ static INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPA
g_Settings.dwIconFlags = db_get_dw(NULL, "Chat", "IconFlags", 0x0000);
g_Settings.dwTrayIconFlags = db_get_dw(NULL, "Chat", "TrayIconFlags", 0x1000);
g_Settings.dwPopupFlags = db_get_dw(NULL, "Chat", "PopupFlags", 0x0000);
- g_Settings.StripFormat = (BOOL)db_get_b(NULL, "Chat", "TrimFormatting", 0);
- g_Settings.TrayIconInactiveOnly = (BOOL)db_get_b(NULL, "Chat", "TrayIconInactiveOnly", 1);
- g_Settings.PopupInactiveOnly = (BOOL)db_get_b(NULL, "Chat", "PopupInactiveOnly", 1);
- g_Settings.LogIndentEnabled = (db_get_b(NULL, "Chat", "LogIndentEnabled", 1) != 0) ? TRUE : FALSE;
+ g_Settings.bStripFormat = db_get_b(NULL, "Chat", "TrimFormatting", 0) != 0;
+ g_Settings.bTrayIconInactiveOnly = db_get_b(NULL, "Chat", "bTrayIconInactiveOnly", 1) != 0;
+ g_Settings.bPopupInactiveOnly = db_get_b(NULL, "Chat", "PopupInactiveOnly", 1) != 0;
+ g_Settings.bLogIndentEnabled = db_get_b(NULL, "Chat", "bLogIndentEnabled", 1) != 0;
if (b != db_get_b(NULL, "Chat", "Tabs", 1)) {
pci->SM_BroadcastMessage(NULL, GC_CLOSEWINDOW, 0, 1, FALSE);
- g_Settings.TabsEnable = db_get_b(NULL, "Chat", "Tabs", 1) != 0;
+ g_Settings.bTabsEnable = db_get_b(NULL, "Chat", "Tabs", 1) != 0;
}
else pci->SM_BroadcastMessage(NULL, GC_SETWNDPROPS, 0, 0, TRUE);
@@ -491,12 +491,12 @@ static INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPA
SetDlgItemText(hwndDlg, IDC_TIMESTAMP, g_Settings.pszTimeStamp);
SetDlgItemText(hwndDlg, IDC_OUTSTAMP, g_Settings.pszOutgoingNick);
SetDlgItemText(hwndDlg, IDC_INSTAMP, g_Settings.pszIncomingNick);
- CheckDlgButton(hwndDlg, IDC_HIGHLIGHT, g_Settings.HighlightEnabled);
- EnableWindow(GetDlgItem(hwndDlg, IDC_HIGHLIGHTWORDS), g_Settings.HighlightEnabled ? TRUE : FALSE);
- CheckDlgButton(hwndDlg, IDC_LOGGING, g_Settings.LoggingEnabled);
- EnableWindow(GetDlgItem(hwndDlg, IDC_LOGDIRECTORY), g_Settings.LoggingEnabled ? TRUE : FALSE);
- EnableWindow(GetDlgItem(hwndDlg, IDC_FONTCHOOSE), g_Settings.LoggingEnabled ? TRUE : FALSE);
- EnableWindow(GetDlgItem(hwndDlg, IDC_LIMIT), g_Settings.LoggingEnabled ? TRUE : FALSE);
+ CheckDlgButton(hwndDlg, IDC_HIGHLIGHT, g_Settings.bHighlightEnabled);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_HIGHLIGHTWORDS), g_Settings.bHighlightEnabled ? TRUE : FALSE);
+ CheckDlgButton(hwndDlg, IDC_LOGGING, g_Settings.bLoggingEnabled);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_LOGDIRECTORY), g_Settings.bLoggingEnabled ? TRUE : FALSE);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_FONTCHOOSE), g_Settings.bLoggingEnabled ? TRUE : FALSE);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_LIMIT), g_Settings.bLoggingEnabled ? TRUE : FALSE);
break;
case WM_COMMAND:
@@ -613,11 +613,11 @@ static INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPA
}
else db_unset(NULL, "Chat", "HeaderOutgoing");
- g_Settings.HighlightEnabled = IsDlgButtonChecked(hwndDlg, IDC_HIGHLIGHT) == BST_CHECKED ? TRUE : FALSE;
- db_set_b(NULL, "Chat", "HighlightEnabled", (BYTE)g_Settings.HighlightEnabled);
+ g_Settings.bHighlightEnabled = IsDlgButtonChecked(hwndDlg, IDC_HIGHLIGHT) == BST_CHECKED;
+ db_set_b(NULL, "Chat", "bHighlightEnabled", g_Settings.bHighlightEnabled);
- g_Settings.LoggingEnabled = IsDlgButtonChecked(hwndDlg, IDC_LOGGING) == BST_CHECKED ? TRUE : FALSE;
- db_set_b(NULL, "Chat", "LoggingEnabled", (BYTE)g_Settings.LoggingEnabled);
+ g_Settings.bLoggingEnabled = IsDlgButtonChecked(hwndDlg, IDC_LOGGING) == BST_CHECKED;
+ db_set_b(NULL, "Chat", "bLoggingEnabled", g_Settings.bLoggingEnabled);
iLen = SendDlgItemMessage(hwndDlg, IDC_SPIN2, UDM_GETPOS, 0, 0);
db_set_w(NULL, "Chat", "LogLimit", (WORD)iLen);
diff --git a/src/core/stdchat/src/services.cpp b/src/core/stdchat/src/services.cpp
index 02b129554c..d921faaecd 100644
--- a/src/core/stdchat/src/services.cpp
+++ b/src/core/stdchat/src/services.cpp
@@ -27,7 +27,7 @@ void ShowRoom(SESSION_INFO *si, WPARAM wp, BOOL bSetForeground)
if (!si)
return;
- if (g_Settings.TabsEnable) {
+ if (g_Settings.bTabsEnable) {
// the session is not the current tab, so we copy the necessary
// details into the SESSION_INFO for the tabbed window
if (!si->hWnd) {
diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp
index d3298ec559..b720302bbc 100644
--- a/src/core/stdchat/src/window.cpp
+++ b/src/core/stdchat/src/window.cpp
@@ -128,7 +128,7 @@ static int RoomWndResize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL *urc)
BOOL bToolbar = bFormat || bControl;
BOOL bSend = (BOOL)db_get_b(NULL, "Chat", "ShowSend", 0);
BOOL bNick = si->iType != GCW_SERVER && si->bNicklistEnabled;
- BOOL bTabs = g_Settings.TabsEnable;
+ BOOL bTabs = g_Settings.bTabsEnable;
BOOL bTabBottom = g_Settings.TabsAtBottom;
RECT rc, rcTabs;
@@ -148,8 +148,8 @@ static int RoomWndResize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL *urc)
ShowWindow(GetDlgItem(hwndDlg, IDC_CHANMGR), bControl ? SW_SHOW : SW_HIDE);
ShowWindow(GetDlgItem(hwndDlg, IDOK), bSend ? SW_SHOW : SW_HIDE);
ShowWindow(GetDlgItem(hwndDlg, IDC_SPLITTERX), bNick ? SW_SHOW : SW_HIDE);
- ShowWindow(GetDlgItem(hwndDlg, IDC_CLOSE), g_Settings.TabsEnable ? SW_SHOW : SW_HIDE);
- ShowWindow(GetDlgItem(hwndDlg, IDC_TAB), g_Settings.TabsEnable ? SW_SHOW : SW_HIDE);
+ ShowWindow(GetDlgItem(hwndDlg, IDC_CLOSE), g_Settings.bTabsEnable ? SW_SHOW : SW_HIDE);
+ ShowWindow(GetDlgItem(hwndDlg, IDC_TAB), g_Settings.bTabsEnable ? SW_SHOW : SW_HIDE);
if (si->iType != GCW_SERVER)
ShowWindow(GetDlgItem(hwndDlg, IDC_LIST), si->bNicklistEnabled ? SW_SHOW : SW_HIDE);
else
@@ -340,7 +340,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
}
if (wParam == VK_TAB && isCtrl && !isShift) { // CTRL-TAB (switch tab/window)
- if (g_Settings.TabsEnable)
+ if (g_Settings.bTabsEnable)
SendMessage(GetParent(hwnd), GC_SWITCHNEXTTAB, 0, 0);
else
pci->ShowRoom(SM_GetNextWindow(Parentsi), WINDOW_VISIBLE, TRUE);
@@ -348,7 +348,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
}
if (wParam == VK_TAB && isCtrl && isShift) { // CTRL_SHIFT-TAB (switch tab/window)
- if (g_Settings.TabsEnable)
+ if (g_Settings.bTabsEnable)
SendMessage(GetParent(hwnd), GC_SWITCHPREVTAB, 0, 0);
else
pci->ShowRoom(SM_GetPrevWindow(Parentsi), WINDOW_VISIBLE, TRUE);
@@ -356,11 +356,11 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
}
if (wParam <= '9' && wParam >= '1' && isCtrl && !isAlt) // CTRL + 1 -> 9 (switch tab)
- if (g_Settings.TabsEnable)
+ if (g_Settings.bTabsEnable)
SendMessage(GetParent(hwnd), GC_SWITCHTAB, 0, (LPARAM)((int)wParam - (int)'1'));
if (wParam <= VK_NUMPAD9 && wParam >= VK_NUMPAD1 && isCtrl && !isAlt) // CTRL + 1 -> 9 (switch tab)
- if (g_Settings.TabsEnable)
+ if (g_Settings.bTabsEnable)
SendMessage(GetParent(hwnd), GC_SWITCHTAB, 0, (LPARAM)((int)wParam - (int)VK_NUMPAD1));
if (wParam == VK_TAB && !isCtrl && !isShift) { //tab-autocomplete
@@ -422,7 +422,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
if (dat->szTabSave[0] != '\0' && wParam != VK_RIGHT && wParam != VK_LEFT &&
wParam != VK_SPACE && wParam != VK_RETURN && wParam != VK_BACK && wParam != VK_DELETE)
{
- if (g_Settings.AddColonToAutoComplete && start == 0)
+ if (g_Settings.bAddColonToAutoComplete && start == 0)
SendMessageA(hwnd, EM_REPLACESEL, FALSE, (LPARAM) ": ");
dat->szTabSave[0] = '\0';
@@ -1177,7 +1177,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
}
// restore previous tabs
- if (g_Settings.TabsEnable && g_Settings.TabRestore) {
+ if (g_Settings.bTabsEnable && g_Settings.TabRestore) {
TABLIST *node = g_TabList;
while (node) {
SESSION_INFO *s = pci->SM_FindSession(node->pszID, node->pszModule);
@@ -1221,7 +1221,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
SendMessage(GetDlgItem(hwndDlg, IDC_LOG), EM_SETBKGNDCOLOR , 0, g_Settings.crLogBackground);
- if (g_Settings.TabsEnable) {
+ if (g_Settings.bTabsEnable) {
int mask = (int)GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_TAB), GWL_STYLE);
if (g_Settings.TabsAtBottom)
mask |= TCS_BOTTOM;
@@ -1251,7 +1251,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
int font = ih > ih2 ? ih : ih2;
// make sure we have space for icon!
- if (g_Settings.ShowContactStatus)
+ if (g_Settings.bShowContactStatus)
font = font > 16 ? font : 16;
SendMessage(GetDlgItem(hwndDlg, IDC_LIST), LB_SETITEMHEIGHT, 0, (LPARAM)height > font ? height : font);
@@ -1332,13 +1332,13 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
break;
}
if (savePerContact) {
- if (RestoreWindowPosition(hwndDlg, g_Settings.TabsEnable?NULL:si->hContact, "Chat", "room", SW_HIDE))
+ if (RestoreWindowPosition(hwndDlg, g_Settings.bTabsEnable?NULL:si->hContact, "Chat", "room", SW_HIDE))
break;
SetWindowPos(hwndDlg, 0, (screen.right-screen.left)/2- (550)/2,(screen.bottom-screen.top)/2- (400)/2, (550), (400), SWP_NOZORDER |SWP_HIDEWINDOW|SWP_NOACTIVATE);
}
else SetWindowPos(hwndDlg, 0, (screen.right-screen.left)/2- (550)/2,(screen.bottom-screen.top)/2- (400)/2, (550), (400), SWP_NOZORDER |SWP_HIDEWINDOW|SWP_NOACTIVATE);
- if (!g_Settings.TabsEnable && pActive && pActive->hWnd && db_get_b(NULL, "Chat", "CascadeWindows", 1)) {
+ if (!g_Settings.bTabsEnable && pActive && pActive->hWnd && db_get_b(NULL, "Chat", "CascadeWindows", 1)) {
RECT rcThis, rcNew;
int dwFlag = SWP_NOZORDER | SWP_NOACTIVATE;
if (!IsWindowVisible((HWND)wParam))
@@ -1624,7 +1624,7 @@ END_REMOVETAB:
if (pci->SM_FindSession(si->ptszID, si->pszModule) == s2)
si->wState = s2->wState;
SendMessage(hwndDlg, GC_FIXTABICONS, 0, (LPARAM)s2);
- if (db_get_b(NULL, "Chat", "FlashWindowHighlight", 0) != 0 && GetActiveWindow() != hwndDlg && GetForegroundWindow() != hwndDlg)
+ if (g_Settings.bFlashWindowHighlight && GetActiveWindow() != hwndDlg && GetForegroundWindow() != hwndDlg)
SetTimer(hwndDlg, TIMERID_FLASHWND, 900, NULL);
break;
} }
@@ -1645,7 +1645,7 @@ END_REMOVETAB:
SESSION_INFO *s2 = (SESSION_INFO*)tci.lParam;
if (s2 && s == s2) { // highlight
SendMessage(hwndDlg, GC_FIXTABICONS, 0, (LPARAM)s2);
- if (g_Settings.FlashWindow && GetActiveWindow() != hwndDlg && GetForegroundWindow() != hwndDlg)
+ if (g_Settings.bFlashWindow && GetActiveWindow() != hwndDlg && GetForegroundWindow() != hwndDlg)
SetTimer(hwndDlg, TIMERID_FLASHWND, 900, NULL);
break;
}
@@ -1752,7 +1752,7 @@ END_REMOVETAB:
int height = db_get_b(NULL, "Chat", "NicklistRowDist", 12);
// make sure we have space for icon!
- if (g_Settings.ShowContactStatus)
+ if (g_Settings.bShowContactStatus)
font = font > 16 ? font : 16;
mis->itemHeight = height > font?height:font;
@@ -1786,14 +1786,14 @@ END_REMOVETAB:
else //if (dis->itemState & ODS_INACTIVE)
FillRect(dis->hDC, &dis->rcItem, pci->hListBkgBrush);
- if (g_Settings.ShowContactStatus && g_Settings.ContactStatusFirst && ui->ContactStatus) {
+ if (g_Settings.bShowContactStatus && g_Settings.bContactStatusFirst && ui->ContactStatus) {
HICON hIcon = LoadSkinnedProtoIcon(si->pszModule, ui->ContactStatus);
DrawIconEx(dis->hDC, x_offset, dis->rcItem.top+offset-3,hIcon,16,16,0,NULL, DI_NORMAL);
x_offset += 18;
}
DrawIconEx(dis->hDC,x_offset, dis->rcItem.top + offset,hIcon,10,10,0,NULL, DI_NORMAL);
x_offset += 12;
- if (g_Settings.ShowContactStatus && !g_Settings.ContactStatusFirst && ui->ContactStatus) {
+ if (g_Settings.bShowContactStatus && !g_Settings.bContactStatusFirst && ui->ContactStatus) {
HICON hIcon = LoadSkinnedProtoIcon(si->pszModule, ui->ContactStatus);
DrawIconEx(dis->hDC, x_offset, dis->rcItem.top+offset-3,hIcon,16,16,0,NULL, DI_NORMAL);
x_offset += 18;
@@ -2013,7 +2013,7 @@ LABEL_SHOWWINDOW:
g_Settings.iWidth = wp.rcNormalPosition.right - wp.rcNormalPosition.left;
g_Settings.iHeight = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top;
- if (g_Settings.TabsEnable) {
+ if (g_Settings.bTabsEnable) {
int i = TabCtrl_GetCurSel(GetDlgItem(hwndDlg, IDC_TAB));
if (i != -1) {
TCITEM tci;
@@ -2530,7 +2530,7 @@ LABEL_SHOWWINDOW:
break;
case WM_CLOSE:
- if (g_Settings.TabsEnable && g_Settings.TabRestore && lParam != 1) {
+ if (g_Settings.bTabsEnable && g_Settings.TabRestore && lParam != 1) {
TCITEM id = { 0 };
int j = TabCtrl_GetItemCount(GetDlgItem(hwndDlg, IDC_TAB)) - 1;
id.mask = TCIF_PARAM;
@@ -2546,7 +2546,7 @@ LABEL_SHOWWINDOW:
break;
case GC_CLOSEWINDOW:
- if (g_Settings.TabsEnable)
+ if (g_Settings.bTabsEnable)
pci->SM_SetTabbedWindowHwnd(0, 0);
DestroyWindow(hwndDlg);
break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 12:37:16 +0000