From 378f689c0e7756fb504109604ab095ffad5faadb Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 19 Jan 2013 19:18:18 +0000 Subject: - Another portion of _T replacement (patch from person) git-svn-id: http://svn.miranda-ng.org/main/trunk@3176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Popup/src/config.cpp | 21 ++++++-------------- plugins/Popup/src/main.cpp | 6 +----- plugins/Popup/src/opt_gen.cpp | 43 +++++++++++++++++----------------------- plugins/Popup/src/popup_wnd2.cpp | 10 +++++----- plugins/Popup/src/skin.cpp | 17 ++++++---------- 5 files changed, 36 insertions(+), 61 deletions(-) (limited to 'plugins/Popup') diff --git a/plugins/Popup/src/config.cpp b/plugins/Popup/src/config.cpp index 2ecf985d1f..a372f79119 100644 --- a/plugins/Popup/src/config.cpp +++ b/plugins/Popup/src/config.cpp @@ -1,10 +1,10 @@ /* Popup Plus plugin for Miranda IM -Copyright © 2002 Luca Santarelli, - © 2004-2007 Victor Pavlychko - © 2010 MPK - © 2010 Merlin_de +Copyright � 2002 Luca Santarelli, + � 2004-2007 Victor Pavlychko + � 2010 MPK + � 2010 Merlin_de This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -98,20 +98,11 @@ void LoadOptions() { void PopUpPreview() { TCHAR *lptzTitle1Eng = TranslateT("The Jabberwocky"); - TCHAR *lptzText1Eng = TranslateTS( - _T("`Twas brillig, and the slithy toves\r\n") - _T("Did gyre and gimble in the wabe:\r\n") - _T("All mimsy were the borogoves,\r\n") - _T("And the mome raths outgrabe.\r\n") - _T("\t[b][i]Lewis Carroll, 1855[/i][/b]") - ); + TCHAR *lptzText1Eng = TranslateT("`Twas brillig, and the slithy toves\r\nDid gyre and gimble in the wabe:\r\nAll mimsy were the borogoves,\r\nAnd the mome raths outgrabe.\r\n\t[b][i]Lewis Carroll, 1855[/i][/b]"); TCHAR *lptzTitle2 = TranslateT("Test preview for the popup plugin settings. This is supposed to be long enough not to fit in one line..."); TCHAR *lptzText2 = TranslateTS( - _T("This is a special test preview for the popup ") - _T("plugin settings. The text and title are quite ") - _T("long so you can tweak your skin and plugin ") - _T("settings to best fit your needs :)") + LPGENT("This is a special test preview for the popup plugin settings. The text and title are quite long so you can tweak your skin and plugin settings to best fit your needs :)") ); POPUPDATA2 ppd = {0}; diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index 764a7acc20..eda317574a 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -454,11 +454,7 @@ MIRAPI int Load(void) LoadPopupThread(); if (!LoadPopupWnd2()) { - MessageBox(0, TranslateTS( - _T("Error: I could not register the PopUp Window class.\r\n") - _T("The plugin will not operate.") - ), - _T(MODULNAME_LONG), MB_ICONSTOP|MB_OK); + MessageBox(0, TranslateT("Error: I could not register the PopUp Window class.\r\nThe plugin will not operate."), _T(MODULNAME_LONG), MB_ICONSTOP | MB_OK); return 0; //We couldn't register our Window Class, don't hook any event: the plugin will act as if it was disabled. } RegisterOptPrevBox(); diff --git a/plugins/Popup/src/opt_gen.cpp b/plugins/Popup/src/opt_gen.cpp index 39f756b606..0d745697bb 100644 --- a/plugins/Popup/src/opt_gen.cpp +++ b/plugins/Popup/src/opt_gen.cpp @@ -1,10 +1,10 @@ /* Popup Plus plugin for Miranda IM -Copyright © 2002 Luca Santarelli, - © 2004-2007 Victor Pavlychko - © 2010 MPK - © 2010 Merlin_de +Copyright � 2002 Luca Santarelli, + � 2004-2007 Victor Pavlychko + � 2010 MPK + � 2010 Merlin_de This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -63,16 +63,16 @@ int AddStatusMode (OPTTREE_OPTION *options, int pos, LPTSTR prefix, DWORD flag) lstrcpy(options[pos].pszOptionName, prefix); switch (flag) { - case PF2_IDLE: lstrcat(options[pos].pszOptionName, _T("/Offline")); break; - case PF2_ONLINE: lstrcat(options[pos].pszOptionName, _T("/Online")); break; - case PF2_INVISIBLE: lstrcat(options[pos].pszOptionName, _T("/Invisible")); break; - case PF2_SHORTAWAY: lstrcat(options[pos].pszOptionName, _T("/Away")); break; - case PF2_LONGAWAY: lstrcat(options[pos].pszOptionName, _T("/NA")); break; - case PF2_LIGHTDND: lstrcat(options[pos].pszOptionName, _T("/Occupied")); break; - case PF2_HEAVYDND: lstrcat(options[pos].pszOptionName, _T("/DND")); break; - case PF2_FREECHAT: lstrcat(options[pos].pszOptionName, _T("/Free for chat")); break; - case PF2_OUTTOLUNCH:lstrcat(options[pos].pszOptionName, _T("/Out to lunch")); break; - case PF2_ONTHEPHONE:lstrcat(options[pos].pszOptionName, _T("/On the phone")); break; + case PF2_IDLE: lstrcat(options[pos].pszOptionName, LPGENT("/Offline")); break; + case PF2_ONLINE: lstrcat(options[pos].pszOptionName, LPGENT("/Online")); break; + case PF2_INVISIBLE: lstrcat(options[pos].pszOptionName, LPGENT("/Invisible")); break; + case PF2_SHORTAWAY: lstrcat(options[pos].pszOptionName, LPGENT("/Away")); break; + case PF2_LONGAWAY: lstrcat(options[pos].pszOptionName, LPGENT("/NA")); break; + case PF2_LIGHTDND: lstrcat(options[pos].pszOptionName, LPGENT("/Occupied")); break; + case PF2_HEAVYDND: lstrcat(options[pos].pszOptionName, LPGENT("/DND")); break; + case PF2_FREECHAT: lstrcat(options[pos].pszOptionName, LPGENT("/Free for chat")); break; + case PF2_OUTTOLUNCH:lstrcat(options[pos].pszOptionName, LPGENT("/Out to lunch")); break; + case PF2_ONTHEPHONE:lstrcat(options[pos].pszOptionName, LPGENT("/On the phone")); break; } return pos+1; } @@ -158,7 +158,7 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM //Dynamic Resize { CheckDlgButton(hwnd, IDC_DYNAMICRESIZE, PopUpOptions.DynamicResize); - SetDlgItemText(hwnd, IDC_USEMAXIMUMWIDTH, PopUpOptions.DynamicResize ? _T("Maximum width"): _T("Width")); + SetDlgItemText(hwnd, IDC_USEMAXIMUMWIDTH, PopUpOptions.DynamicResize ? LPGENT("Maximum width"): LPGENT("Width")); //Minimum Width CheckDlgButton(hwnd, IDC_USEMINIMUMWIDTH, PopUpOptions.UseMinimumWidth); SendDlgItemMessage(hwnd, IDC_MINIMUMWIDTH_SPIN, UDM_SETRANGE, 0, (LPARAM)MAKELONG( @@ -258,8 +258,7 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM mir_free(pszSettingName); pszSettingName = NULL; } OptTree_SetOptions(hwnd, IDC_STATUSES, statusOptions, statusOptionsCount, - DBGetContactSettingDword(NULL, MODULNAME, "Global Status", 0), - _T("Global Status")); + DBGetContactSettingDword(NULL, MODULNAME, "Global Status", 0), _T("Global Status")); } //Debug { @@ -636,14 +635,8 @@ void Check_ReorderPopUps(HWND hwnd) { if (!PopUpOptions.ReorderPopUps && PopUpOptions.ReorderPopUpsWarning) { int res = MessageBox(hwnd, - TranslateTS( - _T("'Reorder Popups' option is currently diabled.\r\n") - _T("This may cause misaligned popups when used with\r\n") - _T("avatars and text replacement (mainly NewStatusNotify).\r\n") - _T("\r\n") - _T("Do you want to enable popup reordering now?\r\n") - ), - TranslateT("Popup Plus Warning"), MB_ICONEXCLAMATION|MB_YESNOCANCEL); + TranslateT("'Reorder Popups' option is currently diabled.\r\nThis may cause misaligned popups when used with\r\navatars and text replacement (mainly NewStatusNotify).\r\n\r\nDo you want to enable popup reordering now?\r\n"), + TranslateT("Popup Plus Warning"), MB_ICONEXCLAMATION | MB_YESNOCANCEL); switch (res) { diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp index fff5b4464a..97393fdab4 100644 --- a/plugins/Popup/src/popup_wnd2.cpp +++ b/plugins/Popup/src/popup_wnd2.cpp @@ -1,10 +1,10 @@ /* Popup Plus plugin for Miranda IM -Copyright © 2002 Luca Santarelli, - © 2004-2007 Victor Pavlychko - © 2010 MPK - © 2010 Merlin_de +Copyright � 2002 Luca Santarelli, + � 2004-2007 Victor Pavlychko + � 2010 MPK + � 2010 Merlin_de This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -102,7 +102,7 @@ bool LoadPopupWnd2() err = GetLastError(); if (!g_wndClass.cPopupEditBox) { TCHAR msg[2048]; - wsprintf(msg, _T("Failed to register custom edit box window class.\r\n\r\ncbSize: %i\r\nstyle: %p\r\nlpfnWndProc: %i\r\ncbClsExtra: %i\r\ncbWndExtra: %i\r\nhInstance: %i\r\nhIcon: %i\r\nhCursor: %i\r\nhbrBackground: %i\r\nlpszMenuName: %s\r\nlpszClassName: %s\r\nhIconSm: %i\r\n"), + wsprintf(msg, LPGENT("Failed to register custom edit box window class.\r\n\r\ncbSize: %i\r\nstyle: %p\r\nlpfnWndProc: %i\r\ncbClsExtra: %i\r\ncbWndExtra: %i\r\nhInstance: %i\r\nhIcon: %i\r\nhCursor: %i\r\nhbrBackground: %i\r\nlpszMenuName: %s\r\nlpszClassName: %s\r\nhIconSm: %i\r\n"), wclw.cbSize, //UINT cbSize; wclw.style, //UINT style; wclw.lpfnWndProc, //WNDPROC lpfnWndProc; diff --git a/plugins/Popup/src/skin.cpp b/plugins/Popup/src/skin.cpp index ee6846bab4..2ef8ee20f8 100644 --- a/plugins/Popup/src/skin.cpp +++ b/plugins/Popup/src/skin.cpp @@ -1,10 +1,10 @@ /* Popup Plus plugin for Miranda IM -Copyright © 2002 Luca Santarelli, - © 2004-2007 Victor Pavlychko - © 2010 MPK - © 2010 Merlin_de +Copyright � 2002 Luca Santarelli, + � 2004-2007 Victor Pavlychko + � 2010 MPK + � 2010 Merlin_de This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1403,13 +1403,8 @@ const PopupSkin *Skins::getSkin(LPCTSTR name) if (!any->skin->isCompatible()) MessageBox(NULL, - TranslateTS( - _T("The skin you are trying to load is designed\r\n") - _T("for newer version of Popup Plus. And will not\r\n") - _T("display properly.\r\n") - _T("\r\n") - _T("Please choose another skin.")), - _T(MODULNAME_LONG), MB_ICONSTOP|MB_OK); + TranslateT("The skin you are trying to load is designed\r\nfor newer version of Popup Plus. And will not\r\ndisplay properly.\r\n\r\nPlease choose another skin."), + _T(MODULNAME_LONG), MB_ICONSTOP | MB_OK); return any->skin; } -- cgit v1.2.3