- HTTPServer: stdafx.cpp added for constant hashes

- Another portion of _T replacement (patch from person)


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

4 files changed, 35 insertions, 35 deletions

diff --git a/plugins/TabSRMM/src/containeroptions.cpp b/plugins/TabSRMM/src/containeroptions.cpp
index 1dade08c30..48ce593a44 100644
--- a/plugins/TabSRMM/src/containeroptions.cpp
+++ b/plugins/TabSRMM/src/containeroptions.cpp
@@ -119,16 +119,16 @@ static struct _tagPages {
 	const TCHAR *szTitle, *szDesc;

 	UINT uIds[10];

 } o_pages[] = {

-	{ _T("General options"), NULL, IDC_O_NOTABS, IDC_O_STICKY, IDC_VERTICALMAX, IDC_AUTOSPLITTER, IDC_O_AUTOHIDE, IDC_AUTOCLOSETABTIME, IDC_AUTOCLOSETABSPIN, IDC_O_AUTOHIDESECONDS, 0, 0},

-	{ _T("Window layout"), NULL, IDC_CNTNOSTATUSBAR, IDC_HIDEMENUBAR, IDC_UIDSTATUSBAR, IDC_HIDETOOLBAR, IDC_INFOPANEL, IDC_BOTTOMTOOLBAR, 0, 0, 0, 0},

-	{ _T("Tabs and switch bar"), _T("Choose your options for the tabbed user interface. Not all options can be applied to open windows. You may need to close and re-open them."), IDC_TABMODE, IDC_O_TABMODE, IDC_O_SBARLAYOUT, IDC_SBARLAYOUT, IDC_FLASHICON, IDC_FLASHLABEL, IDC_SINGLEROWTAB, IDC_BUTTONTABS, IDC_CLOSEBUTTONONTABS, 0},

-	{ _T("Notifications"), _T("Select, when you want to see event notifications (popups) for this window. The settings apply to all tabs within this window."), IDC_O_DONTREPORT, IDC_DONTREPORTUNFOCUSED2, IDC_DONTREPORTFOCUSED2, IDC_ALWAYSPOPUPSINACTIVE, IDC_O_EXPLAINGLOBALNOTIFY, 0, 0, 0, 0, 0},

-	{ _T("Flashing"), NULL, IDC_O_FLASHDEFAULT, IDC_O_FLASHALWAYS, IDC_O_FLASHNEVER, 0, 0, 0, 0, 0, 0, 0},

-	{ _T("Title bar"), NULL, IDC_O_HIDETITLE, IDC_TITLEFORMAT, IDC_O_TITLEBARFORMAT, IDC_O_HELP_TITLEFORMAT, 0, 0, 0, 0, 0, 0},

-	{ _T("Window size and theme"), _T("You can select a private theme (.tabsrmm file) for this container which will then override the default message log theme. You will have to close and re-open all message windows after changing this option."), IDC_THEME, IDC_SELECTTHEME, IDC_USEGLOBALSIZE, IDC_SAVESIZEASGLOBAL, IDC_LABEL_PRIVATETHEME, IDC_TSLABEL_EXPLAINTHEME, 0, 0, 0, 0},

-	{ _T("Transparency"), _T("This feature requires Windows 2000 or later and may be unavailable when using a container skin."), IDC_TRANSPARENCY, IDC_TRANSPARENCY_ACTIVE, IDC_TRANSPARENCY_INACTIVE, IDC_TSLABEL_ACTIVE, IDC_TSLABEL_INACTIVE, 0, 0, 0, 0, 0},

-	{ _T("Contact avatars"), NULL, IDC_O_STATIC_AVATAR, IDC_O_STATIC_OWNAVATAR, IDC_AVATARMODE, IDC_OWNAVATARMODE, IDC_AVATARSONTASKBAR, 0, 0, 0, 0, 0},

-	{ _T("Sound notifications"), NULL, IDC_O_ENABLESOUNDS, IDC_O_SOUNDSMINIMIZED, IDC_O_SOUNDSUNFOCUSED, IDC_O_SOUNDSINACTIVE, IDC_O_SOUNDSFOCUSED, 0, 0, 0, 0, 0},

+	{ LPGENT("General options"), NULL, IDC_O_NOTABS, IDC_O_STICKY, IDC_VERTICALMAX, IDC_AUTOSPLITTER, IDC_O_AUTOHIDE, IDC_AUTOCLOSETABTIME, IDC_AUTOCLOSETABSPIN, IDC_O_AUTOHIDESECONDS, 0, 0},

+	{ LPGENT("Window layout"), NULL, IDC_CNTNOSTATUSBAR, IDC_HIDEMENUBAR, IDC_UIDSTATUSBAR, IDC_HIDETOOLBAR, IDC_INFOPANEL, IDC_BOTTOMTOOLBAR, 0, 0, 0, 0},

+	{ LPGENT("Tabs and switch bar"), LPGENT("Choose your options for the tabbed user interface. Not all options can be applied to open windows. You may need to close and re-open them."), IDC_TABMODE, IDC_O_TABMODE, IDC_O_SBARLAYOUT, IDC_SBARLAYOUT, IDC_FLASHICON, IDC_FLASHLABEL, IDC_SINGLEROWTAB, IDC_BUTTONTABS, IDC_CLOSEBUTTONONTABS, 0},

+	{ LPGENT("Notifications"), LPGENT("Select, when you want to see event notifications (popups) for this window. The settings apply to all tabs within this window."), IDC_O_DONTREPORT, IDC_DONTREPORTUNFOCUSED2, IDC_DONTREPORTFOCUSED2, IDC_ALWAYSPOPUPSINACTIVE, IDC_O_EXPLAINGLOBALNOTIFY, 0, 0, 0, 0, 0},

+	{ LPGENT("Flashing"), NULL, IDC_O_FLASHDEFAULT, IDC_O_FLASHALWAYS, IDC_O_FLASHNEVER, 0, 0, 0, 0, 0, 0, 0},

+	{ LPGENT("Title bar"), NULL, IDC_O_HIDETITLE, IDC_TITLEFORMAT, IDC_O_TITLEBARFORMAT, IDC_O_HELP_TITLEFORMAT, 0, 0, 0, 0, 0, 0},

+	{ LPGENT("Window size and theme"), LPGENT("You can select a private theme (.tabsrmm file) for this container which will then override the default message log theme. You will have to close and re-open all message windows after changing this option."), IDC_THEME, IDC_SELECTTHEME, IDC_USEGLOBALSIZE, IDC_SAVESIZEASGLOBAL, IDC_LABEL_PRIVATETHEME, IDC_TSLABEL_EXPLAINTHEME, 0, 0, 0, 0},

+	{ LPGENT("Transparency"), LPGENT("This feature requires Windows 2000 or later and may be unavailable when using a container skin."), IDC_TRANSPARENCY, IDC_TRANSPARENCY_ACTIVE, IDC_TRANSPARENCY_INACTIVE, IDC_TSLABEL_ACTIVE, IDC_TSLABEL_INACTIVE, 0, 0, 0, 0, 0},

+	{ LPGENT("Contact avatars"), NULL, IDC_O_STATIC_AVATAR, IDC_O_STATIC_OWNAVATAR, IDC_AVATARMODE, IDC_OWNAVATARMODE, IDC_AVATARSONTASKBAR, 0, 0, 0, 0, 0},

+	{ LPGENT("Sound notifications"), NULL, IDC_O_ENABLESOUNDS, IDC_O_SOUNDSMINIMIZED, IDC_O_SOUNDSUNFOCUSED, IDC_O_SOUNDSINACTIVE, IDC_O_SOUNDSFOCUSED, 0, 0, 0, 0, 0},

 };

 

 static void ShowPage(HWND hwndDlg, int iPage, BOOL fShow)

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index f574c34378..07a30a8d41 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -57,9 +57,9 @@ static struct {
 }

 tooltips[] =

 {

-	{ IDC_ADD, _T("Add this contact permanently to your contact list") },

-	{ IDC_CANCELADD, _T("Do not add this contact permanently") },

-	{ IDC_TOGGLESIDEBAR, _T("Expand or collapse the side bar") }

+	{ IDC_ADD, LPGENT("Add this contact permanently to your contact list") },

+	{ IDC_CANCELADD, LPGENT("Do not add this contact permanently") },

+	{ IDC_TOGGLESIDEBAR, LPGENT("Expand or collapse the side bar") }

 };

 

 static struct {

diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp
index 7c97261957..c8dd66df89 100644
--- a/plugins/TabSRMM/src/msglog.cpp
+++ b/plugins/TabSRMM/src/msglog.cpp
@@ -43,22 +43,22 @@ extern 		int 	CacheIconToBMP(struct TLogIcon *theIcon, HICON hIcon, COLORREF bac
 extern		void 	DeleteCachedIcon(struct TLogIcon *theIcon);

 

 struct TCpTable cpTable[] = {

-	{ 874,	_T("Thai")	 },

-	{ 932,	_T("Japanese") },

-	{ 936,	_T("Simplified Chinese") },

-	{ 949,	_T("Korean") },

-	{ 950,	_T("Traditional Chinese") },

-	{ 1250,	_T("Central European") },

-	{ 1251,	_T("Cyrillic") },

-	{ 20866,  _T("Cyrillic KOI8-R") },

-	{ 1252,	_T("Latin I") },

-	{ 1253,	_T("Greek") },

-	{ 1254,	_T("Turkish") },

-	{ 1255,	_T("Hebrew") },

-	{ 1256,	_T("Arabic") },

-	{ 1257,	_T("Baltic") },

-	{ 1258,	_T("Vietnamese") },

-	{ 1361,	_T("Korean (Johab)") },

+	{ 874,	LPGENT("Thai")	 },

+	{ 932,	LPGENT("Japanese") },

+	{ 936,	LPGENT("Simplified Chinese") },

+	{ 949,	LPGENT("Korean") },

+	{ 950,	LPGENT("Traditional Chinese") },

+	{ 1250,	LPGENT("Central European") },

+	{ 1251,	LPGENT("Cyrillic") },

+	{ 20866,LPGENT("Cyrillic KOI8-R") },

+	{ 1252,	LPGENT("Latin I") },

+	{ 1253,	LPGENT("Greek") },

+	{ 1254,	LPGENT("Turkish") },

+	{ 1255,	LPGENT("Hebrew") },

+	{ 1256,	LPGENT("Arabic") },

+	{ 1257,	LPGENT("Baltic") },

+	{ 1258,	LPGENT("Vietnamese") },

+	{ 1361,	LPGENT("Korean (Johab)") },

 	{   -1,     NULL}

 };

 

diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp
index c003407376..6c5d833ffe 100644
--- a/plugins/TabSRMM/src/themes.cpp
+++ b/plugins/TabSRMM/src/themes.cpp
@@ -120,10 +120,10 @@ AeroEffect* 	CSkin::m_pCurrentAeroEffect = 0;
 

 AeroEffect  CSkin::m_aeroEffects[AERO_EFFECT_LAST] = {

 	{

-		_T("No effect"), 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0

+		LPGENT("No effect"), 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0

 	},

 	{

-		_T("Milky Glass"),

+		LPGENT("Milky Glass"),

 		0xf5f5f5, 									/* base color */

 		0xaaaaaa,									/* gradient color */

 		70,											/* base alpha */

@@ -138,7 +138,7 @@ AeroEffect  CSkin::m_aeroEffects[AERO_EFFECT_LAST] = {
 		AeroEffectCallback_Milk						/* callback function to render the effect */

 	},

 	{

-		_T("Carbon"),

+		LPGENT("Carbon"),

 		0xf0f0f0,

 		0x000000,

 		75,

@@ -153,7 +153,7 @@ AeroEffect  CSkin::m_aeroEffects[AERO_EFFECT_LAST] = {
 		AeroEffectCallback_Carbon

 	},

 	{

-		_T("Semi transparent, custom colors"),

+		LPGENT("Semi transparent, custom colors"),

 		0xffffff,

 		0x444444,

 		60,

@@ -168,7 +168,7 @@ AeroEffect  CSkin::m_aeroEffects[AERO_EFFECT_LAST] = {
 		AeroEffectCallback_Solid

 	},

 	{

-		_T("Silver shadow"),

+		LPGENT("Silver shadow"),

 		0xffffff,

 		0xa0a0a0,

 		80,

@@ -183,7 +183,7 @@ AeroEffect  CSkin::m_aeroEffects[AERO_EFFECT_LAST] = {
 		AeroEffectCallback_Solid

 	},

 	{

-		_T("Custom (use own gradient colors)"),

+		LPGENT("Custom (use own gradient colors)"),

 		0xffffff,

 		0xa0a0a0,

 		80,