UI Utils classes & templates moved to the core, thus allowing any plugin to use them

git-svn-id: http://svn.miranda-ng.org/main/trunk@12492 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 70 insertions, 72 deletions

diff --git a/protocols/IRCG/src/irc_dlg.h b/protocols/IRCG/src/irc_dlg.h
index cd251c5a16..9f18a90862 100644
--- a/protocols/IRCG/src/irc_dlg.h
+++ b/protocols/IRCG/src/irc_dlg.h
@@ -19,26 +19,24 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "ui_utils.h"

-

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

 // Dialogs

 

-struct CMessageBoxDlg : public CProtoDlgBase<CIrcProto>

+struct CMessageBoxDlg : public CProtoDlgBase < CIrcProto >

 {

 	DCCINFO* pdci;

 

-	CMessageBoxDlg( CIrcProto* _pro, DCCINFO* _dci );

+	CMessageBoxDlg(CIrcProto* _pro, DCCINFO* _dci);

 

 	CCtrlButton  m_Ok;

-	void OnOk( CCtrlButton* );

+	void OnOk(CCtrlButton*);

 

 	virtual void OnInitDialog();

 };

 

-struct CCoolIrcDlg : public CProtoDlgBase<CIrcProto>

+struct CCoolIrcDlg : public CProtoDlgBase < CIrcProto >

 {

-	CCoolIrcDlg( CIrcProto* _pro, int dlgId, HWND parent = NULL );

+	CCoolIrcDlg(CIrcProto* _pro, int dlgId, HWND parent = NULL);

 

 	virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam);

 

@@ -48,24 +46,24 @@ struct CCoolIrcDlg : public CProtoDlgBase<CIrcProto>
 

 struct CWhoisDlg : public CCoolIrcDlg

 {

-	CWhoisDlg( CIrcProto* _pro );

+	CWhoisDlg(CIrcProto* _pro);

 

 	CCtrlCombo  m_InfoNick;

 	CCtrlEdit   m_Reply;

 	CCtrlBase   m_Caption, m_AwayTime;

 	CCtrlBase   m_InfoName, m_InfoId, m_InfoAddress, m_InfoChannels, m_InfoAuth,

-		         m_InfoServer, m_InfoAway2, m_InfoOther;

+		m_InfoServer, m_InfoAway2, m_InfoOther;

 	CCtrlButton m_Ping, m_Version, m_Time, m_userInfo, m_Refresh, m_Query;

 

-	void ShowMessage( const CIrcMessage* );

-	void ShowMessageNoUser( const CIrcMessage* );

+	void ShowMessage(const CIrcMessage*);

+	void ShowMessageNoUser(const CIrcMessage*);

 

-	void OnGo( CCtrlButton* );

-	void OnQuery( CCtrlButton* );

-	void OnPing( CCtrlButton* );

-	void OnUserInfo( CCtrlButton* );

-	void OnTime( CCtrlButton* );

-	void OnVersion( CCtrlButton* );

+	void OnGo(CCtrlButton*);

+	void OnQuery(CCtrlButton*);

+	void OnPing(CCtrlButton*);

+	void OnUserInfo(CCtrlButton*);

+	void OnTime(CCtrlButton*);

+	void OnVersion(CCtrlButton*);

 

 	virtual void OnInitDialog();

 	virtual void OnClose();

@@ -74,7 +72,7 @@ struct CWhoisDlg : public CCoolIrcDlg
 

 struct CNickDlg : public CCoolIrcDlg

 {

-	CNickDlg( CIrcProto* _pro );

+	CNickDlg(CIrcProto* _pro);

 

 	CCtrlCombo   m_Enick;

 	CCtrlButton  m_Ok;

@@ -82,15 +80,15 @@ struct CNickDlg : public CCoolIrcDlg
 	virtual void OnInitDialog();

 	virtual void OnDestroy();

 

-	void OnOk( CCtrlButton* );

+	void OnOk(CCtrlButton*);

 };

 

-struct CListDlg : public CProtoDlgBase<CIrcProto>

+struct CListDlg : public CProtoDlgBase < CIrcProto >

 {

-	CListDlg( CIrcProto* _pro );

+	CListDlg(CIrcProto* _pro);

 

 	virtual void OnInitDialog();

-	virtual void OnChange( CCtrlBase* ctrl );

+	virtual void OnChange(CCtrlBase* ctrl);

 	virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam);

 	virtual void OnDestroy();

 	virtual int Resizer(UTILRESIZECONTROL *urc);

@@ -100,27 +98,27 @@ struct CListDlg : public CProtoDlgBase<CIrcProto>
 	UINT_PTR m_timer;

 

 	CCtrlButton m_Join;

-	void OnJoin( CCtrlButton* );

+	void OnJoin(CCtrlButton*);

 

-	void List_OnColumnClick( CCtrlListView::TEventInfo* ev );

+	void List_OnColumnClick(CCtrlListView::TEventInfo* ev);

 

-	void UpdateList( void );

+	void UpdateList(void);

 };

 

 struct CJoinDlg : public CCoolIrcDlg

 {

-	CJoinDlg( CIrcProto* _pro );

+	CJoinDlg(CIrcProto* _pro);

 

 	virtual void OnInitDialog();

 	virtual void OnDestroy();

 

 	CCtrlButton  m_Ok;

-	void OnOk( CCtrlButton* );

+	void OnOk(CCtrlButton*);

 };

 

 struct CQuickDlg : public CCoolIrcDlg

 {

-	CQuickDlg( CIrcProto* _pro );

+	CQuickDlg(CIrcProto* _pro);

 

 	virtual void OnInitDialog();

 	virtual void OnDestroy();

@@ -129,7 +127,7 @@ struct CQuickDlg : public CCoolIrcDlg
 	void OnServerCombo(CCtrlData*);

 

 	CCtrlButton  m_Ok;

-	void OnOk( CCtrlButton* );

+	void OnOk(CCtrlButton*);

 

 private:

 	struct SERVER_INFO* m_si;

@@ -137,7 +135,7 @@ private:
 

 struct CManagerDlg : public CCoolIrcDlg

 {

-	CManagerDlg( CIrcProto* _pro );

+	CManagerDlg(CIrcProto* _pro);

 

 	CCtrlCheck   m_check1, m_check2, m_check3, m_check4, m_check5, m_check6, m_check7, m_check8, m_check9;

 	CCtrlEdit    m_key, m_limit;

@@ -155,32 +153,32 @@ struct CManagerDlg : public CCoolIrcDlg
 	void OnCheck6(CCtrlData*);

 	void OnRadio(CCtrlData*);

 

-	void OnAdd( CCtrlButton* );

-	void OnEdit( CCtrlButton* );

-	void OnRemove( CCtrlButton* );

+	void OnAdd(CCtrlButton*);

+	void OnEdit(CCtrlButton*);

+	void OnRemove(CCtrlButton*);

 

-	void OnListDblClick( CCtrlListBox* );

-	void OnChangeList( CCtrlListBox* );

+	void OnListDblClick(CCtrlListBox*);

+	void OnChangeList(CCtrlListBox*);

 	void OnChangeModes(CCtrlData*);

 	void OnChangeTopic(CCtrlData*);

 

-	void OnApplyModes( CCtrlButton* );

-	void OnApplyTopic( CCtrlButton* );

+	void OnApplyModes(CCtrlButton*);

+	void OnApplyTopic(CCtrlButton*);

 

 	void ApplyQuestion();

 	void CloseQuestion();

-	void InitManager( int mode, const TCHAR* window );

+	void InitManager(int mode, const TCHAR* window);

 };

 

 struct CQuestionDlg : public CCoolIrcDlg

 {

-	CQuestionDlg( CIrcProto* _pro, CManagerDlg* owner = NULL );

+	CQuestionDlg(CIrcProto* _pro, CManagerDlg* owner = NULL);

 

 	virtual void OnInitDialog();

 	virtual void OnClose();

 

 	CCtrlButton  m_Ok;

-	void OnOk( CCtrlButton* );

+	void OnOk(CCtrlButton*);

 

 	void Activate();

 

@@ -193,7 +191,7 @@ private:
 

 //---- the first property page: Account -------------------------------------------------

 

-struct CConnectPrefsDlg : public CProtoDlgBase<CIrcProto>

+struct CConnectPrefsDlg : public CProtoDlgBase < CIrcProto >

 {

 	bool m_serverlistModified;

 

@@ -206,21 +204,21 @@ struct CConnectPrefsDlg : public CProtoDlgBase<CIrcProto>
 	CCtrlEdit    m_identSystem, m_identPort;

 

 	CCtrlCheck   m_forceVisible, m_rejoinOnKick, m_rejoinChannels, m_disableError,

-		          m_address, m_useServer, m_showServer, m_keepAlive, m_autoJoin,

-					 m_oldStyle, m_onlineNotif, m_channelAway, m_enableServer;

+		m_address, m_useServer, m_showServer, m_keepAlive, m_autoJoin,

+		m_oldStyle, m_onlineNotif, m_channelAway, m_enableServer;

 	CCtrlEdit    m_onlineTimer, m_limit, m_spin1, m_spin2, m_ssl;

 

-	CConnectPrefsDlg( CIrcProto* _pro );

+	CConnectPrefsDlg(CIrcProto* _pro);

 

-	static CDlgBase* Create( void* param ) { return new CConnectPrefsDlg(( CIrcProto* )param ); }

+	static CDlgBase* Create(void* param) { return new CConnectPrefsDlg((CIrcProto*)param); }

 

 	virtual void OnInitDialog();

 	virtual void OnApply();

 

 	void OnServerCombo(CCtrlData*);

-	void OnAddServer( CCtrlButton* );

-	void OnDeleteServer( CCtrlButton* );

-	void OnEditServer( CCtrlButton* );

+	void OnAddServer(CCtrlButton*);

+	void OnDeleteServer(CCtrlButton*);

+	void OnEditServer(CCtrlButton*);

 	void OnStartup(CCtrlData*);

 	void OnIdent(CCtrlData*);

 	void OnUseServer(CCtrlData*);

@@ -231,16 +229,16 @@ struct CConnectPrefsDlg : public CProtoDlgBase<CIrcProto>
 

 //---- the second property page: DCC/CTCP -----------------------------------------------

 

-struct CCtcpPrefsDlg : public CProtoDlgBase<CIrcProto>

+struct CCtcpPrefsDlg : public CProtoDlgBase < CIrcProto >

 {

 	CCtrlCombo m_combo;

 	CCtrlCheck m_slow, m_fast, m_disc, m_passive, m_sendNotice, m_enableIP, m_fromServer;

 	CCtrlEdit m_ip, m_userInfo;

 	CCtrlCheck m_radio1, m_radio2, m_radio3;

 

-	CCtcpPrefsDlg( CIrcProto* _pro );

+	CCtcpPrefsDlg(CIrcProto* _pro);

 

-	static CDlgBase* Create( void* param ) { return new CCtcpPrefsDlg(( CIrcProto* )param ); }

+	static CDlgBase* Create(void* param) { return new CCtcpPrefsDlg((CIrcProto*)param); }

 

 	virtual void OnInitDialog();

 	virtual void OnApply();

@@ -250,7 +248,7 @@ struct CCtcpPrefsDlg : public CProtoDlgBase<CIrcProto>
 

 //---- the third property page: Other ---------------------------------------------------

 

-struct COtherPrefsDlg : public CProtoDlgBase<CIrcProto>

+struct COtherPrefsDlg : public CProtoDlgBase < CIrcProto >

 {

 	bool m_performlistModified;

 

@@ -260,36 +258,36 @@ struct COtherPrefsDlg : public CProtoDlgBase<CIrcProto>
 	CCtrlEdit    m_pertormEdit, m_quitMessage, m_alias;

 	CCtrlCheck   m_perform, m_scripting, m_autodetect;

 

-	COtherPrefsDlg( CIrcProto* _pro );

+	COtherPrefsDlg(CIrcProto* _pro);

 

-	static CDlgBase* Create( void* param ) { return new COtherPrefsDlg(( CIrcProto* )param ); }

+	static CDlgBase* Create(void* param) { return new COtherPrefsDlg((CIrcProto*)param); }

 

 	virtual void OnInitDialog();

 	virtual void OnApply();

 	virtual void OnDestroy();

 

-	void OnUrl( CCtrlButton* );

+	void OnUrl(CCtrlButton*);

 	void OnPerformCombo(CCtrlData*);

 	void OnCodePage(CCtrlData*);

 	void OnPerformEdit(CCtrlData*);

 	void OnPerform(CCtrlData*);

-	void OnAdd( CCtrlButton* );

-	void OnDelete( CCtrlButton* );

+	void OnAdd(CCtrlButton*);

+	void OnDelete(CCtrlButton*);

 

-	void addPerformComboValue( int idx, const char* szValueName );

+	void addPerformComboValue(int idx, const char* szValueName);

 };

 

 //---- the fourth property page: Ignore -------------------------------------------------

 

-struct CIgnorePrefsDlg : public CProtoDlgBase<CIrcProto>

+struct CIgnorePrefsDlg : public CProtoDlgBase < CIrcProto >

 {

 	CCtrlMButton m_add, m_edit, m_del;

 	CCtrlCheck m_enable, m_ignoreChat, m_ignoreFile, m_ignoreChannel, m_ignoreUnknown;

 	CCtrlListView m_list;

-	

-	CIgnorePrefsDlg( CIrcProto* _pro );

 

-	static CDlgBase* Create( void* param ) { return new CIgnorePrefsDlg(( CIrcProto* )param ); }

+	CIgnorePrefsDlg(CIrcProto* _pro);

+

+	static CDlgBase* Create(void* param) { return new CIgnorePrefsDlg((CIrcProto*)param); }

 

 	virtual void OnInitDialog();

 	virtual void OnDestroy();

@@ -297,29 +295,29 @@ struct CIgnorePrefsDlg : public CProtoDlgBase<CIrcProto>
 

 	virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam);

 

-	void List_OnColumnClick( CCtrlListView::TEventInfo* );

+	void List_OnColumnClick(CCtrlListView::TEventInfo*);

 	void OnEnableIgnore(CCtrlData*);

 	void OnIgnoreChat(CCtrlData*);

-	void OnAdd( CCtrlButton* );

-	void OnEdit( CCtrlButton* );

-	void OnDelete( CCtrlButton* );

+	void OnAdd(CCtrlButton*);

+	void OnEdit(CCtrlButton*);

+	void OnDelete(CCtrlButton*);

 

-	void FixButtons( void );

-	void RebuildList( void );

-	void UpdateList( void );

+	void FixButtons(void);

+	void RebuildList(void);

+	void UpdateList(void);

 };

 

-struct CAddIgnoreDlg : public CProtoDlgBase<CIrcProto>

+struct CAddIgnoreDlg : public CProtoDlgBase < CIrcProto >

 {

 	CCtrlButton m_Ok;

 	CIgnorePrefsDlg* m_owner;

 

 	TCHAR szOldMask[500];

 

-	CAddIgnoreDlg( CIrcProto* _pro, const TCHAR* mask, CIgnorePrefsDlg* parent );

+	CAddIgnoreDlg(CIrcProto* _pro, const TCHAR* mask, CIgnorePrefsDlg* parent);

 

 	virtual void OnInitDialog();

 	virtual void OnClose();

 

-	void OnOk( CCtrlButton* );

+	void OnOk(CCtrlButton*);

 };