diff options
| author | George Hazan <ghazan@miranda.im> | 2022-08-15 20:44:17 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2022-08-15 20:44:17 +0300 |
| commit | 55d19a5ced6bf185c96a13b4498121405fef8662 (patch) | |
| tree | ddc4862f9eed24c4c9153467e032642a115bdcec /plugins/TabSRMM | |
| parent | 7518561eddbe1349e145654e906321ce9808832b (diff) | |
for #3150 - tabSRMM that displays avatars in group chats
Diffstat (limited to 'plugins/TabSRMM')
| -rw-r--r-- | plugins/TabSRMM/res/chat.rc | 21 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgdlgother.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/resource.h | 4 |
3 files changed, 11 insertions, 16 deletions
diff --git a/plugins/TabSRMM/res/chat.rc b/plugins/TabSRMM/res/chat.rc index ece569adff..00fff0a077 100644 --- a/plugins/TabSRMM/res/chat.rc +++ b/plugins/TabSRMM/res/chat.rc @@ -16,7 +16,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1251)
+#pragma code_page(1252)
/////////////////////////////////////////////////////////////////////////////
//
@@ -30,8 +30,9 @@ BEGIN CONTROL "",IDC_SPLITTERX,"Static",SS_ENHMETAFILE,172,23,10,73
CONTROL "",IDC_SPLITTERY,"Static",SS_ENHMETAFILE,0,132,251,6
CONTROL "",IDC_SRMM_MESSAGE,"RichEdit50W",WS_VSCROLL | WS_TABSTOP | 0x1144,0,128,127,12,WS_EX_STATICEDGE
+ CONTROL "",IDC_CONTACTPIC,"Button",BS_OWNERDRAW,242,127,12,12
CONTROL "",IDC_SRMM_LOG,"RichEdit50W",WS_VSCROLL | 0x944,8,23,164,72,WS_EX_STATICEDGE
- LISTBOX IDC_SRMM_NICKLIST,182,23,69,73,LBS_MULTIPLESEL | LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | LBS_NODATA | NOT WS_BORDER | WS_VSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+ LISTBOX IDC_SRMM_NICKLIST,182,98,69,42,LBS_MULTIPLESEL | LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | LBS_NODATA | NOT WS_BORDER | WS_VSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
CONTROL "",IDC_PANELSPLITTER,"Static",SS_ENHMETAFILE,0,32,252,1,WS_EX_TRANSPARENT
END
@@ -156,17 +157,6 @@ BEGIN IDD_CHANNEL, DIALOG
BEGIN
RIGHTMARGIN, 251
- VERTGUIDE, 8
- VERTGUIDE, 172
- VERTGUIDE, 182
- VERTGUIDE, 237
- HORZGUIDE, 8
- HORZGUIDE, 23
- HORZGUIDE, 70
- HORZGUIDE, 96
- HORZGUIDE, 102
- HORZGUIDE, 108
- HORZGUIDE, 121
END
IDD_FILTER, DIALOG
@@ -245,6 +235,11 @@ BEGIN 0
END
+IDD_CHANNEL AFX_DIALOG_LAYOUT
+BEGIN
+ 0
+END
+
#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp index d9edce60ae..87725bbc14 100644 --- a/plugins/TabSRMM/src/msgdlgother.cpp +++ b/plugins/TabSRMM/src/msgdlgother.cpp @@ -864,7 +864,7 @@ bool CMsgDialog::GetAvatarVisibility() // infopanel visible, consider own avatar display m_bShowAvatar = false; if (m_si) - return false; + bAvatarMode = 1; if (m_pPanel.isActive() && bAvatarMode != 3) { if (!bOwnAvatarMode) { diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h index be0770e65d..4b7231c1ad 100644 --- a/plugins/TabSRMM/src/resource.h +++ b/plugins/TabSRMM/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
-// Used by w:\miranda-ng\plugins\TabSRMM\res\resource.rc
+// Used by C:\Users\georg\DiskW\miranda-ng\plugins\TabSRMM\res\chat.rc
//
#define IDD_TEMPLATEEDIT 1
#define VS_VERSION_INFO 1
@@ -792,7 +792,7 @@ //
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 106
+#define _APS_NEXT_RESOURCE_VALUE 107
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 101
|