Scriver: highlight Apply button only if settings changed

code cleanup

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

2 files changed, 150 insertions, 138 deletions

diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp
index 95b95325bb..9ad6119688 100644
--- a/plugins/Scriver/src/msgoptions.cpp
+++ b/plugins/Scriver/src/msgoptions.cpp
@@ -46,8 +46,8 @@ static const TabDef tabPages[] = {
 	{ DlgProcOptions2, IDD_OPTIONS2, LPGEN("Group Chat Log") }

 };

 

-#define FONTF_BOLD   1

-#define FONTF_ITALIC 2

+#define FONTF_BOLD		1

+#define FONTF_ITALIC	2

 

 typedef struct FontOptionsListStruct

 {

@@ -57,7 +57,7 @@ typedef struct FontOptionsListStruct
 	BYTE defStyle;

 	char defSize;

 	const TCHAR *szBkgName;

-}FontOptionsList;

+} FontOptionsList;

 

 static const FontOptionsList fontOptionsList[] = {

 	{ LPGENT("Outgoing messages"), RGB(106, 106, 106), _T("Arial"), 0, -12, LPGENT("Outgoing background")},

@@ -102,7 +102,7 @@ int FontServiceFontsChanged(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static BYTE MsgDlgGetFontDefaultCharset(const TCHAR* szFont)

+static BYTE MsgDlgGetFontDefaultCharset(const TCHAR *szFont)

 {

 	return DEFAULT_CHARSET;

 }

@@ -113,7 +113,7 @@ void RegisterFontServiceFonts()
 	FontIDT fid = { sizeof(fid) };

 	mir_sntprintf(fid.group, SIZEOF(fid.group), _T("%s"), LPGENT("Messaging"));

 	mir_sntprintf(fid.backgroundGroup, SIZEOF(fid.backgroundGroup), _T("%s"), LPGENT("Messaging"));

-	strncpy(fid.dbSettingsGroup, (SRMMMOD), SIZEOF(fid.dbSettingsGroup));

+	strncpy(fid.dbSettingsGroup, SRMMMOD, SIZEOF(fid.dbSettingsGroup));

 	fid.flags = FIDF_DEFAULTVALID | FIDF_DEFAULTVALID;

 	for (i = 0; i < SIZEOF(fontOptionsList); i++) {

 		fid.order = i;

@@ -133,7 +133,7 @@ void RegisterFontServiceFonts()
 

 	ColourIDT cid = { sizeof(cid) };

 	mir_sntprintf(cid.group, SIZEOF(cid.group), _T("%s"), LPGENT("Messaging"));

-	strncpy(cid.dbSettingsGroup, (SRMMMOD), SIZEOF(fid.dbSettingsGroup));

+	strncpy(cid.dbSettingsGroup, SRMMMOD, SIZEOF(fid.dbSettingsGroup));

 	cid.flags = 0;

 	for (i = 0; i < SIZEOF(colourOptionsList); i++) {

 		cid.order = i;

@@ -206,8 +206,8 @@ void LoadMsgDlgFont(int i, LOGFONT *lf, COLORREF *colour)
 

 struct CheckBoxValues_t

 {

-	DWORD  style;

-	const TCHAR* szDescr;

+	DWORD style;

+	const TCHAR *szDescr;

 };

 

 static const struct CheckBoxValues_t statusValues[] =

@@ -300,22 +300,22 @@ static INT_PTR CALLBACK DlgProcTabsOptions(HWND hwndDlg, UINT msg, WPARAM wParam
 			CheckDlgButton(hwndDlg, IDC_SEPARATECHATSCONTAINERS, db_get_b(NULL, SRMMMOD, SRMSGSET_SEPARATECHATSCONTAINERS, SRMSGDEFSET_SEPARATECHATSCONTAINERS));

 

 			bChecked = IsDlgButtonChecked(hwndDlg, IDC_USETABS);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_ALWAYSSHOWTABS), bChecked );

-			EnableWindow(GetDlgItem(hwndDlg, IDC_TABSATBOTTOM), bChecked );

-			EnableWindow(GetDlgItem(hwndDlg, IDC_SWITCHTOACTIVE), bChecked );

-			EnableWindow(GetDlgItem(hwndDlg, IDC_TABCLOSEBUTTON), bChecked );

-			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITNAMES), bChecked );

-			EnableWindow(GetDlgItem(hwndDlg, IDC_SEPARATECHATSCONTAINERS), bChecked );

-			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITTABS), bChecked );

+			EnableWindow(GetDlgItem(hwndDlg, IDC_ALWAYSSHOWTABS), bChecked);

+			EnableWindow(GetDlgItem(hwndDlg, IDC_TABSATBOTTOM), bChecked);

+			EnableWindow(GetDlgItem(hwndDlg, IDC_SWITCHTOACTIVE), bChecked);

+			EnableWindow(GetDlgItem(hwndDlg, IDC_TABCLOSEBUTTON), bChecked);

+			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITNAMES), bChecked);

+			EnableWindow(GetDlgItem(hwndDlg, IDC_SEPARATECHATSCONTAINERS), bChecked);

+			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITTABS), bChecked);

 			bChecked = IsDlgButtonChecked(hwndDlg, IDC_USETABS) && IsDlgButtonChecked(hwndDlg, IDC_LIMITNAMES);

 			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITNAMESLEN), bChecked);

 			EnableWindow(GetDlgItem(hwndDlg, IDC_CHARS), bChecked);

 			bChecked = IsDlgButtonChecked(hwndDlg, IDC_USETABS) && IsDlgButtonChecked(hwndDlg, IDC_LIMITTABS);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITTABSNUM), bChecked );

+			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITTABSNUM), bChecked);

 			bChecked = IsDlgButtonChecked(hwndDlg, IDC_USETABS) && IsDlgButtonChecked(hwndDlg, IDC_SEPARATECHATSCONTAINERS);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITCHATSTABS), bChecked );

+			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITCHATSTABS), bChecked);

 			bChecked = bChecked && IsDlgButtonChecked(hwndDlg, IDC_LIMITCHATSTABS);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITCHATSTABSNUM), bChecked );

+			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITCHATSTABSNUM), bChecked);

 		}

 		return TRUE;

 

@@ -360,28 +360,28 @@ static INT_PTR CALLBACK DlgProcTabsOptions(HWND hwndDlg, UINT msg, WPARAM wParam
 		break;

 

 	case WM_NOTIFY:

-		switch (((LPNMHDR) lParam)->idFrom) {

+		switch (((LPNMHDR)lParam)->idFrom) {

 		case 0:

-			switch (((LPNMHDR) lParam)->code) {

+			switch (((LPNMHDR)lParam)->code) {

 			case PSN_APPLY:

 				int limitLength;

-				db_set_b(NULL, SRMMMOD, SRMSGSET_USETABS, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_USETABS));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_TABSATBOTTOM, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_TABSATBOTTOM));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_LIMITNAMES, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_LIMITNAMES));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_USETABS, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_USETABS));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_TABSATBOTTOM, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TABSATBOTTOM));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_LIMITNAMES, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_LIMITNAMES));

 				(limitLength = GetDlgItemInt(hwndDlg, IDC_LIMITNAMESLEN, NULL, TRUE)) >= SRMSGSET_LIMITNAMESLEN_MIN ? GetDlgItemInt(hwndDlg, IDC_LIMITNAMESLEN, NULL, TRUE) : SRMSGSET_LIMITNAMESLEN_MIN;

 				db_set_dw(NULL, SRMMMOD, SRMSGSET_LIMITNAMESLEN, limitLength);

 

-				db_set_b(NULL, SRMMMOD, SRMSGSET_LIMITTABS, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_LIMITTABS));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_LIMITTABS, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_LIMITTABS));

 				limitLength = GetDlgItemInt(hwndDlg, IDC_LIMITTABSNUM, NULL, TRUE) >= 1 ? GetDlgItemInt(hwndDlg, IDC_LIMITTABSNUM, NULL, TRUE) : 1;

 				db_set_dw(NULL, SRMMMOD, SRMSGSET_LIMITTABSNUM, limitLength);

-				db_set_b(NULL, SRMMMOD, SRMSGSET_LIMITCHATSTABS, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_LIMITCHATSTABS));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_LIMITCHATSTABS, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_LIMITCHATSTABS));

 				limitLength = GetDlgItemInt(hwndDlg, IDC_LIMITCHATSTABSNUM, NULL, TRUE) >= 1 ? GetDlgItemInt(hwndDlg, IDC_LIMITCHATSTABSNUM, NULL, TRUE) : 1;

 				db_set_dw(NULL, SRMMMOD, SRMSGSET_LIMITCHATSTABSNUM, limitLength);

 

-				db_set_b(NULL, SRMMMOD, SRMSGSET_HIDEONETAB, (BYTE) !IsDlgButtonChecked(hwndDlg, IDC_ALWAYSSHOWTABS));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_SWITCHTOACTIVE, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SWITCHTOACTIVE));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_TABCLOSEBUTTON, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_TABCLOSEBUTTON));

-				db_set_b(NULL, SRMMMOD, SRMSGSET_SEPARATECHATSCONTAINERS, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SEPARATECHATSCONTAINERS));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_HIDEONETAB, (BYTE)!IsDlgButtonChecked(hwndDlg, IDC_ALWAYSSHOWTABS));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SWITCHTOACTIVE, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SWITCHTOACTIVE));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_TABCLOSEBUTTON, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TABCLOSEBUTTON));

+				db_set_b(NULL, SRMMMOD, SRMSGSET_SEPARATECHATSCONTAINERS, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SEPARATECHATSCONTAINERS));

 

 				ApplyChanges(8);

 				return TRUE;

@@ -427,7 +427,7 @@ static INT_PTR CALLBACK DlgProcLayoutOptions(HWND hwndDlg, UINT msg, WPARAM wPar
 

 			CheckDlgButton(hwndDlg, IDC_STATUSWIN, db_get_b(NULL, SRMMMOD, SRMSGSET_STATUSICON, SRMSGDEFSET_STATUSICON));

 			CheckDlgButton(hwndDlg, IDC_SHOWPROGRESS, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWPROGRESS, SRMSGDEFSET_SHOWPROGRESS));

-			CheckDlgButton(hwndDlg, IDC_AVATARSUPPORT, g_dat.flags&SMF_AVATAR);

+			CheckDlgButton(hwndDlg, IDC_AVATARSUPPORT, g_dat.flags & SMF_AVATAR);

 			return TRUE;

 		}

 

@@ -446,7 +446,7 @@ static INT_PTR CALLBACK DlgProcLayoutOptions(HWND hwndDlg, UINT msg, WPARAM wPar
 			break;

 

 		case IDC_INPUTLINES:

-			if (HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus())

+			if (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus())

 				return 0;

 			break;

 		}

@@ -615,7 +615,7 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 	return FALSE;

 }

 

-static void ShowPreview(HWND hwndDlg) 

+static void ShowPreview(HWND hwndDlg)

 {

 	struct GlobalMessageData gdat = { 0 };

 	PARAFORMAT2 pf2;

@@ -632,10 +632,10 @@ static void ShowPreview(HWND hwndDlg)
 	gdat.flags |= IsDlgButtonChecked(hwndDlg, IDC_DRAWLINES) ? SMF_DRAWLINES : 0;

 	gdat.flags |= IsDlgButtonChecked(hwndDlg, IDC_INDENTTEXT) ? SMF_INDENTTEXT : 0;

 	gdat.logLineColour = SendDlgItemMessage(hwndDlg, IDC_LINECOLOUR, CPM_GETCOLOUR, 0, 0);

-	gdat.indentSize = (int) SendDlgItemMessage(hwndDlg, IDC_INDENTSPIN, UDM_GETPOS, 0, 0);

+	gdat.indentSize = (int)SendDlgItemMessage(hwndDlg, IDC_INDENTSPIN, UDM_GETPOS, 0, 0);

 	pf2.cbSize = sizeof(pf2);

 	pf2.dwMask = PFM_OFFSET;

-	pf2.dxOffset = (gdat.flags & SMF_INDENTTEXT) ? gdat.indentSize * 1440 /g_dat.logPixelSX : 0;

+	pf2.dxOffset = (gdat.flags & SMF_INDENTTEXT) ? gdat.indentSize * 1440 / g_dat.logPixelSX : 0;

 	SetDlgItemText(hwndDlg, IDC_LOG, _T(""));

 	SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETPARAFORMAT, 0, (LPARAM)&pf2);

 	StreamInTestEvents(GetDlgItem(hwndDlg, IDC_LOG), &gdat);

@@ -711,7 +711,7 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam,
 			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETEDITSTYLE, SES_EXTENDBACKCOLOR, SES_EXTENDBACKCOLOR);

 			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0, 0));

 			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_AUTOURLDETECT, TRUE, 0);

-			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETOLECALLBACK, 0, (LPARAM)& reOleCallback);

+			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETOLECALLBACK, 0, (LPARAM)&reOleCallback);

 		}

 		ShowPreview(hwndDlg);

 		return TRUE;

@@ -728,6 +728,7 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam,
 				Options_Open(&ood);

 			}

 			break;

+		case IDC_LOADUNREAD:

 		case IDC_LOADCOUNT:

 		case IDC_LOADTIME:

 			EnableWindow(GetDlgItem(hwndDlg, IDC_LOADCOUNTN), IsDlgButtonChecked(hwndDlg, IDC_LOADCOUNT));

@@ -776,6 +777,8 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam,
 			if (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus())

 				return TRUE;

 			break;

+		case IDC_LOG:

+			return 0;

 		}

 		MarkChanges(4, hwndDlg);

 		break;

@@ -878,11 +881,11 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam
 			CLCINFOITEM cii = { sizeof(cii) };

 			cii.flags = CLCIIF_GROUPFONT | CLCIIF_CHECKBOX;

 			cii.pszText = (TCHAR *)TranslateT("** New contacts **");

-			hItemNew = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)& cii);

+			hItemNew = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)&cii);

 			cii.pszText = (TCHAR *)TranslateT("** Unknown contacts **");

-			hItemUnknown = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)& cii);

+			hItemUnknown = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)&cii);

 		}

-		SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE) | (CLS_SHOWHIDDEN) | (CLS_NOHIDEOFFLINE));

+		SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE) | CLS_SHOWHIDDEN | CLS_NOHIDEOFFLINE);

 		ResetCList(hwndDlg);

 		RebuildList(hwndDlg, hItemNew, hItemUnknown);

 		CheckDlgButton(hwndDlg, IDC_SHOWNOTIFY, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPING, SRMSGDEFSET_SHOWTYPING));

@@ -975,7 +978,7 @@ int OptInitialise(WPARAM wParam, LPARAM lParam)
 	for (int i = 0; i < SIZEOF(tabPages); i++) {

 		odp.pszTemplate = MAKEINTRESOURCEA(tabPages[i].dlgId);

 		odp.pfnDlgProc = tabPages[i].dlgProc;

-		odp.pszTab = (char*)tabPages[i].tabName;

+		odp.pszTab = (char *)tabPages[i].tabName;

 		Options_AddPage(wParam, &odp);

 	}

 

diff --git a/plugins/Scriver/src/resource.h b/plugins/Scriver/src/resource.h
index 4ec3aabdf2..b3fbcafad0 100644
--- a/plugins/Scriver/src/resource.h
+++ b/plugins/Scriver/src/resource.h
@@ -1,3 +1,8 @@
+//{{NO_DEPENDENCIES}}

+// Microsoft Visual C++ generated include file.

+// Used by ..\res\resource.rc

+//

+#define VS_VERSION_INFO                 1

 #define IDD_MSGWIN                      100

 #define IDD_MSG                         101

 #define IDD_MSGSENDERROR                102

@@ -22,7 +27,6 @@
 #define IDI_OUTGOING                    133

 #define IDI_NOTICE                      134

 #define IDI_CLOSEX                      135

-

 #define IDI_GOOGLE                      140

 #define IDI_BING                        141

 #define IDI_YANDEX                      142

@@ -32,10 +36,7 @@
 #define IDI_YAHOO                       146

 #define IDI_FOODNETWORK                 147

 #define IDI_LASTICON                    148

-

 #define IDR_CONTEXT                     180

-

-/* chat dll */

 #define IDD_CHANNEL                     401

 #define IDD_OPTIONS1                    402

 #define IDD_OPTIONS2                    403

@@ -73,31 +74,29 @@
 #define IDI_NICKLIST2                   461

 #define IDI_FILTER2                     462

 #define IDI_TYPINGOFF                   463

-

 #define IDC_HYPERLINKHAND               600

-#define IDC_DRAGCURSOR					601

-

+#define IDC_DRAGCURSOR                  601

 #define IDC_TABS                        1000

 #define IDC_LOG                         1001

 #define IDC_MESSAGE                     1002

 #define IDC_AUTOPOPUP                   1003

 #define IDC_AUTOMIN                     1005

-#define IDC_STAYMINIMIZED				1006

-#define IDC_SWITCHTOACTIVE				1007

-#define IDC_SEPARATECHATSCONTAINERS		1008

-#define IDC_TABCLOSEBUTTON				1009

-#define IDC_LIMITTABS					1010

-#define IDC_LIMITTABSNUM				1011

-#define IDC_LIMITCHATSTABS				1012

-#define IDC_LIMITCHATSTABSNUM			1013

+#define IDC_STAYMINIMIZED               1006

+#define IDC_SWITCHTOACTIVE              1007

+#define IDC_SEPARATECHATSCONTAINERS     1008

+#define IDC_TABCLOSEBUTTON              1009

+#define IDC_LIMITTABS                   1010

+#define IDC_LIMITTABSNUM                1011

+#define IDC_LIMITCHATSTABS              1012

+#define IDC_LIMITCHATSTABSNUM           1013

 #define IDC_SPLITTER                    1017

 #define IDC_SHOWNAMES                   1020

 #define IDC_USETABS                     1022

 #define IDC_SHOWSECONDS                 1023

 #define IDC_USELONGDATE                 1024

 #define IDC_USERELATIVEDATE             1025

-#define IDC_USEIEVIEW					1026

-#define IDC_FONTSCOLORS					1027

+#define IDC_USEIEVIEW                   1026

+#define IDC_FONTSCOLORS                 1027

 #define IDC_SHOWLOGICONS                1032

 #define IDC_SHOWTIMES                   1033

 #define IDC_SHOWDATES                   1034

@@ -123,12 +122,12 @@
 #define IDC_DETAILS                     1069

 #define IDC_ADD                         1070

 #define IDC_USERMENU                    1071

-#define IDC_QUOTE						1072

+#define IDC_QUOTE                       1072

 #define IDC_HISTORY                     1080

 #define IDC_SMILEYS                     1081

-#define IDC_REMEMBER					1082

-#define IDC_INFOBAR_NAME				1090

-#define IDC_INFOBAR_STATUS				1091

+#define IDC_REMEMBER                    1082

+#define IDC_INFOBAR_NAME                1090

+#define IDC_INFOBAR_STATUS              1091

 #define IDC_STMSGLOGGROUP               1442

 #define IDC_ERRORTEXT                   1596

 #define IDC_MSGTEXT                     1597

@@ -148,34 +147,86 @@
 #define IDC_TRANSPARENCY                1616

 #define IDC_MARKFOLLOWUPS               1617

 #define IDC_MESSAGEONNEWLINE            1618

-#define IDC_ATRANSPARENCYVALUE			1619

+#define IDC_ATRANSPARENCYVALUE          1619

 #define IDC_ATRANSPARENCYPERC           1620

-#define IDC_ITRANSPARENCYVALUE			1621

+#define IDC_ITRANSPARENCYVALUE          1621

 #define IDC_ITRANSPARENCYPERC           1622

 #define IDC_ALWAYSSHOWTABS              1623

-#define IDC_SENDALL						1624

-#define IDC_TRANSPARENCYTEXT1			1627

-#define IDC_TRANSPARENCYTEXT2			1628

-#define IDC_DRAWLINES					1629

-#define IDC_LINECOLOUR					1630

-#define IDC_SAVEDRAFTS					1631

-#define IDC_POPLIST						1632

-#define IDC_LIMITNAMESLEN	            1633

-#define IDC_CHARS						1634

-#define IDC_INDENTTEXT					1635

-#define IDC_INDENTSIZE					1636

-#define IDC_INDENTSPIN					1637

-#define IDC_HIDECONTAINERS				1638

+#define IDC_SENDALL                     1624

+#define IDC_TRANSPARENCYTEXT1           1627

+#define IDC_TRANSPARENCYTEXT2           1628

+#define IDC_DRAWLINES                   1629

+#define IDC_LINECOLOUR                  1630

+#define IDC_SAVEDRAFTS                  1631

+#define IDC_POPLIST                     1632

+#define IDC_LIMITNAMESLEN               1633

+#define IDC_CHARS                       1634

+#define IDC_INDENTTEXT                  1635

+#define IDC_INDENTSIZE                  1636

+#define IDC_INDENTSPIN                  1637

+#define IDC_HIDECONTAINERS              1638

 #define IDC_ORIGINALAVATARH             1639

-#define IDC_TYPINGSWITCH				1640

-#define IDC_LOADCOUNTTEXT2				1641

-#define IDC_CHAT_NICKROWTEXT2			1642

-#define IDC_CHAT_LIMITTEXT2				1643

-#define IDC_INFOBAR						1644

-#define IDC_AVATAR						1645

+#define IDC_TYPINGSWITCH                1640

+#define IDC_LOADCOUNTTEXT2              1641

+#define IDC_CHAT_NICKROWTEXT2           1642

+#define IDC_CHAT_LIMITTEXT2             1643

+#define IDC_INFOBAR                     1644

+#define IDC_AVATAR                      1645

 #define IDC_XSTATUSICON                 1646

 #define IDC_INPUTLINES                  1647

 #define IDC_INPUTLINESSPIN              1648

+#define IDC_CHAT_LOG                    5005

+#define IDC_CHAT_SPLITTERX              5006

+#define IDC_CHAT_SMILEY                 5007

+#define IDC_CHAT_SPLITTERY              5008

+#define IDC_CHAT_MESSAGE                5009

+#define IDC_CHAT_BOLD                   5010

+#define IDC_CHAT_ITALICS                5011

+#define IDC_CHAT_UNDERLINE              5012

+#define IDC_CHAT_FILTER                 5013

+#define IDC_CHAT_CHANMGR                5014

+#define IDC_CHAT_SHOWNICKLIST           5016

+#define IDC_CHAT_COLOR                  5017

+#define IDC_CHAT_BKGCOLOR               5019

+#define IDC_CHAT_FONTSIZE               5020

+#define IDC_CHAT_CHECKBOXES             5021

+#define IDC_CHAT_HISTORY                5022

+#define IDC_CHAT_NICKROW                5024

+#define IDC_CHAT_LOGLIMIT               5024

+#define IDC_CHAT_SPIN1                  5028

+#define IDC_CHAT_SPIN2                  5029

+#define IDC_CHAT_SPIN3                  5030

+#define IDC_CHAT_HIGHLIGHTWORDS         5040

+#define IDC_CHAT_INSTAMP                5041

+#define IDC_CHAT_OUTSTAMP               5043

+#define IDC_CHAT_TIMESTAMP              5046

+#define IDC_CHAT_LOGDIRCHOOSE           5047

+#define IDC_CHAT_LOGDIRECTORY           5048

+#define IDC_CHAT_LIMIT                  5050

+#define IDC_CHAT_LOGTIMESTAMP           5051

+#define IDC_CHAT_GROUP                  5057

+#define IDC_CHAT_RADIO1                 5061

+#define IDC_CHAT_RADIO2                 5062

+#define IDC_CHAT_RADIO3                 5063

+#define IDC_CHAT_TEXT                   5064

+#define IDC_CHAT_BKG                    5065

+#define IDC_CHAT_TIMEOUT                5067

+#define IDC_CHAT_HIGHLIGHT              5068

+#define IDC_CHAT_TEXTO                  5069

+#define IDC_CHAT_LOGGING                5069

+#define IDC_CHAT_COLORTEXT              5070

+#define IDC_CHAT_LIST                   5072

+#define IDC_CHAT_1                      5075

+#define IDC_CHAT_2                      5076

+#define IDC_CHAT_3                      5077

+#define IDC_CHAT_4                      5078

+#define IDC_CHAT_5                      5079

+#define IDC_CHAT_6                      5080

+#define IDC_CHAT_7                      5081

+#define IDC_CHAT_8                      5082

+#define IDC_CHAT_9                      5083

+#define IDC_CHAT_10                     5084

+#define IDC_CHAT_11                     5085

 #define IDM_CUT                         40000

 #define IDM_COPY                        40001

 #define IDM_PASTE                       40002

@@ -188,9 +239,9 @@
 #define IDM_CLEAR                       40013

 #define IDM_OPENLINK                    40014

 #define IDM_COPYLINK                    40016

-#define IDM_CLOSETAB					       40020

-#define IDM_CLOSEOTHERTABS				    40021

-#define IDM_TOPMOST						    40040

+#define IDM_CLOSETAB                    40020

+#define IDM_CLOSEOTHERTABS              40021

+#define IDM_TOPMOST                     40040

 #define IDM_SEARCH_GOOGLE               40080

 #define IDM_SEARCH_BING                 40081

 #define IDM_SEARCH_YANDEX               40082

@@ -199,60 +250,18 @@
 #define IDM_SEARCH_GOOGLE_TRANSLATE     40085

 #define IDM_SEARCH_YAHOO                40086

 #define IDM_SEARCH_FOODNETWORK          40087

-/* chat.dll resources */

-

-#define IDC_CHAT_LOG                         5005

-#define IDC_CHAT_SPLITTERX                   5006

-#define IDC_CHAT_SMILEY                      5007

-#define IDC_CHAT_SPLITTERY                   5008

-#define IDC_CHAT_MESSAGE                     5009

-#define IDC_CHAT_BOLD                        5010

-#define IDC_CHAT_ITALICS                     5011

-#define IDC_CHAT_UNDERLINE                   5012

-#define IDC_CHAT_FILTER                      5013

-#define IDC_CHAT_CHANMGR                     5014

-#define IDC_CHAT_SHOWNICKLIST                5016

-#define IDC_CHAT_COLOR                       5017

-#define IDC_CHAT_BKGCOLOR                    5019

-#define IDC_CHAT_FONTSIZE			5020

-#define IDC_CHAT_CHECKBOXES                  5021

-#define IDC_CHAT_HISTORY                     5022

-#define IDC_CHAT_NICKROW                     5024

-#define IDC_CHAT_LOGLIMIT                    5024

-#define IDC_CHAT_SPIN1                       5028

-#define IDC_CHAT_SPIN2                       5029

-#define IDC_CHAT_SPIN3                       5030

-#define IDC_CHAT_HIGHLIGHTWORDS              5040

-#define IDC_CHAT_INSTAMP                     5041

-#define IDC_CHAT_OUTSTAMP                    5043

-#define IDC_CHAT_TIMESTAMP                   5046

-#define IDC_CHAT_LOGDIRCHOOSE                5047

-#define IDC_CHAT_LOGDIRECTORY                5048

-#define IDC_CHAT_LIMIT                       5050

-#define IDC_CHAT_LOGTIMESTAMP                5051

-#define IDC_CHAT_GROUP                       5057

-#define IDC_CHAT_RADIO1                      5061

-#define IDC_CHAT_RADIO2                      5062

-#define IDC_CHAT_RADIO3                      5063

-#define IDC_CHAT_TEXT                        5064

-#define IDC_CHAT_BKG                         5065

-#define IDC_CHAT_TIMEOUT                     5067

-#define IDC_CHAT_HIGHLIGHT                   5068

-#define IDC_CHAT_TEXTO                       5069

-#define IDC_CHAT_LOGGING                     5069

-#define IDC_CHAT_COLORTEXT                   5070

-#define IDC_CHAT_LIST                        5072

-#define IDC_CHAT_1                           5075

-#define IDC_CHAT_2                           5076

-#define IDC_CHAT_3                           5077

-#define IDC_CHAT_4                           5078

-#define IDC_CHAT_5                           5079

-#define IDC_CHAT_6                           5080

-#define IDC_CHAT_7                           5081

-#define IDC_CHAT_8                           5082

-#define IDC_CHAT_9                           5083

-#define IDC_CHAT_10                          5084

-#define IDC_CHAT_11                          5085

 #define ID_MESS                         50001

 #define ID_COPYALL                      50006

 #define ID_Menu                         50026

+#define IDC_STATIC                      -1

+

+// Next default values for new objects

+// 

+#ifdef APSTUDIO_INVOKED

+#ifndef APSTUDIO_READONLY_SYMBOLS

+#define _APS_NEXT_RESOURCE_VALUE        101

+#define _APS_NEXT_COMMAND_VALUE         40001

+#define _APS_NEXT_CONTROL_VALUE         1000

+#define _APS_NEXT_SYMED_VALUE           101

+#endif

+#endif