nick list moved to mir_app

2 files changed, 39 insertions, 9 deletions

diff --git a/include/chat_resource.h b/include/chat_resource.h
new file mode 100644
index 0000000000..60e340c9c1
--- /dev/null
+++ b/include/chat_resource.h
@@ -0,0 +1,34 @@
+/*
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (?) 2012-17 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#define IDC_SRMM_COLOR        3001
+#define IDC_SRMM_BKGCOLOR     3002
+#define IDC_SRMM_BOLD         3003
+#define IDC_SRMM_ITALICS      3004
+#define IDC_SRMM_UNDERLINE    3005
+#define IDC_SRMM_FILTER       3006
+#define IDC_SRMM_CHANMGR      3007
+#define IDC_SRMM_SHOWNICKLIST 3008
+#define IDC_SRMM_HISTORY      3009
+#define IDC_SRMM_NICKLIST     3010
diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index 47200cdc94..a43327e6a0 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -209,6 +209,7 @@ struct GlobalLogSettingsBase
 	bool     bTimeStampEventColour;

 	bool		bShowContactStatus;

 	bool		bContactStatusFirst;

+	bool     bDoubleClick4Privat;    // send a private message on dblclick in a nick list

 	DWORD    dwIconFlags;

 	DWORD    dwTrayIconFlags;

 	DWORD    dwPopupFlags;

@@ -386,15 +387,7 @@ EXTERN_C MIR_APP_DLL(void) Chat_UpdateOptions();
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-#define IDC_SRMM_COLOR     3001

-#define IDC_SRMM_BKGCOLOR  3002

-#define IDC_SRMM_BOLD      3003

-#define IDC_SRMM_ITALICS   3004

-#define IDC_SRMM_UNDERLINE 3005

-#define IDC_SRMM_FILTER    3006

-#define IDC_SRMM_CHANMGR   3007

-#define IDC_SRMM_NICKLIST  3008

-#define IDC_SRMM_HISTORY   3009

+#include <chat_resource.h>

 

 class MIR_APP_EXPORT CSrmmBaseDialog : public CDlgBase

 {

@@ -416,6 +409,7 @@ protected:
 	SESSION_INFO *m_si;

 	COLORREF m_clrInputBG, m_clrInputFG;

 	

+	CCtrlListBox m_nickList;

 	CCtrlButton m_btnColor, m_btnBkColor;

 	CCtrlButton m_btnBold, m_btnItalic, m_btnUnderline;

 	CCtrlButton m_btnHistory, m_btnChannelMgr, m_btnNickList, m_btnFilter;

@@ -427,6 +421,8 @@ protected:
 	void onClick_ChanMgr(CCtrlButton*);

 	void onClick_History(CCtrlButton*);

 

+	void onDblClick_List(CCtrlListBox*);

+

 public:

 	MCONTACT m_hContact;

 	int m_iLogFilterFlags;