diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-01-19 08:32:55 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-01-19 08:32:55 +0000 |
| commit | 529c7d557a7dc8693c68c0fb66275e9fe999c0d2 (patch) | |
| tree | 910856bbad72b1d6ef5b978231deaf712b5713aa /src/core | |
| parent | 9c194061aa46f713290fe6b7598a4462711ebe54 (diff) | |
- StdChat-related data removed from core;
- fix for displaying icons in chat log;
git-svn-id: http://svn.miranda-ng.org/main/trunk@7743 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/stdchat/src/chat.h | 7 | ||||
| -rw-r--r-- | src/core/stdchat/src/main.cpp | 11 | ||||
| -rw-r--r-- | src/core/stdchat/src/options.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdchat/src/window.cpp | 2 |
4 files changed, 12 insertions, 10 deletions
diff --git a/src/core/stdchat/src/chat.h b/src/core/stdchat/src/chat.h index 3c3fb68d4e..c5e3472401 100644 --- a/src/core/stdchat/src/chat.h +++ b/src/core/stdchat/src/chat.h @@ -88,6 +88,7 @@ struct MODULEINFO : public GCModuleInfoBase struct SESSION_INFO : public GCSessionInfoBase
{
+ int iX, iY;
IAccPropServices* pAccPropServicesForNickList;
};
@@ -95,10 +96,8 @@ struct LOGSTREAMDATA : public GCLogStreamDataBase {}; struct GlobalLogSettings : public GlobalLogSettingsBase
{
- BOOL TabsEnable;
- BOOL TabsAtBottom;
- BOOL TabCloseOnDblClick;
- BOOL TabRestore;
+ int iX, iY;
+ bool TabsEnable, TabsAtBottom, TabCloseOnDblClick, TabRestore;
};
extern GlobalLogSettings g_Settings;
diff --git a/src/core/stdchat/src/main.cpp b/src/core/stdchat/src/main.cpp index 3d799b1a99..b785eb0e46 100644 --- a/src/core/stdchat/src/main.cpp +++ b/src/core/stdchat/src/main.cpp @@ -253,10 +253,13 @@ static BOOL DoPopup(SESSION_INFO *si, GCEVENT *gce) static void OnLoadSettings()
{
- g_Settings.TabsEnable = db_get_b(NULL, "Chat", "Tabs", 1);
- g_Settings.TabRestore = db_get_b(NULL, "Chat", "TabRestore", 0);
- g_Settings.TabsAtBottom = db_get_b(NULL, "Chat", "TabBottom", 0);
- g_Settings.TabCloseOnDblClick = db_get_b(NULL, "Chat", "TabCloseOnDblClick", 0);
+ 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.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;
ZeroMemory(&g_TabSession, sizeof(SESSION_INFO));
g_TabSession.iType = GCW_TABROOM;
diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp index 987996a1b6..f643253b81 100644 --- a/src/core/stdchat/src/options.cpp +++ b/src/core/stdchat/src/options.cpp @@ -430,7 +430,7 @@ static INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPA 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);
+ g_Settings.TabsEnable = db_get_b(NULL, "Chat", "Tabs", 1) != 0;
}
else pci->SM_BroadcastMessage(NULL, GC_SETWNDPROPS, 0, 0, TRUE);
diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp index cd03088966..d3298ec559 100644 --- a/src/core/stdchat/src/window.cpp +++ b/src/core/stdchat/src/window.cpp @@ -1177,7 +1177,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) }
// restore previous tabs
- if (g_Settings.TabsEnable && db_get_b(NULL, "Chat", "TabRestore", 0)) {
+ if (g_Settings.TabsEnable && g_Settings.TabRestore) {
TABLIST *node = g_TabList;
while (node) {
SESSION_INFO *s = pci->SM_FindSession(node->pszID, node->pszModule);
|