From 346981c06e7e810d44a0fc05c649f538c501ae21 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Sat, 5 Apr 2014 17:56:53 +0000 Subject: - fixes #640 (IRC: "server code page option" reset its value) - ressource fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@8865 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IRCG/res/IRC.rc | 106 +++++++++++++++++++++++----------------- protocols/IRCG/src/clist.cpp | 2 +- protocols/IRCG/src/input.cpp | 2 +- protocols/IRCG/src/irc.h | 8 +-- protocols/IRCG/src/ircproto.cpp | 2 +- protocols/IRCG/src/options.cpp | 19 ++++--- protocols/IRCG/src/resource.h | 2 +- 7 files changed, 77 insertions(+), 64 deletions(-) (limited to 'protocols') diff --git a/protocols/IRCG/res/IRC.rc b/protocols/IRCG/res/IRC.rc index 3aee5e01b0..add2667534 100644 --- a/protocols/IRCG/res/IRC.rc +++ b/protocols/IRCG/res/IRC.rc @@ -17,7 +17,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#pragma code_page(1251) +#pragma code_page(1252) ///////////////////////////////////////////////////////////////////////////// // @@ -53,22 +53,40 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN + GROUPBOX "Default network",IDC_STATIC,2,0,142,134 + CONTROL "Enable",IDC_STARTUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,11,125,10 + LTEXT "Server name",IDC_STATIC,10,22,125,8,0,WS_EX_TRANSPARENT COMBOBOX IDC_SERVERCOMBO,10,30,125,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_SERVER,10,53,88,12,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP | NOT WS_TABSTOP - EDITTEXT IDC_PORT,10,75,50,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_TABSTOP,WS_EX_RIGHT - EDITTEXT IDC_PORT2,85,75,50,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_TABSTOP,WS_EX_RIGHT + CONTROL "Internet address",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,10,45,81,8,WS_EX_TRANSPARENT + EDITTEXT IDC_SERVER,10,53,88,12,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP | WS_TABSTOP + LTEXT "SSL",IDC_STATIC,107,45,28,8,0,WS_EX_TRANSPARENT + EDITTEXT IDC_SSL,107,53,28,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_TABSTOP,WS_EX_RIGHT + LTEXT "Port range",IDC_STATIC,10,67,125,8,0,WS_EX_TRANSPARENT + EDITTEXT IDC_PORT,10,75,50,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_TABSTOP,WS_EX_RIGHT + LTEXT "->",IDC_STATIC,71,75,8,8 + EDITTEXT IDC_PORT2,85,75,50,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_TABSTOP,WS_EX_RIGHT + LTEXT "Password",IDC_STATIC,10,90,125,8,0,WS_EX_TRANSPARENT EDITTEXT IDC_PASS,10,100,125,12,ES_PASSWORD | ES_AUTOHSCROLL CONTROL "&Add",IDC_ADDSERVER,"MButtonClass",WS_DISABLED | WS_TABSTOP,16,116,27,14,WS_EX_NOACTIVATE | 0x10000000L CONTROL "&Edit",IDC_EDITSERVER,"MButtonClass",WS_DISABLED | WS_TABSTOP,59,116,27,14,WS_EX_NOACTIVATE | 0x10000000L CONTROL "&Del",IDC_DELETESERVER,"MButtonClass",WS_DISABLED | WS_TABSTOP,102,116,27,14,WS_EX_NOACTIVATE | 0x10000000L + GROUPBOX "User info - Required",IDC_STATIC,150,0,154,90 + RTEXT "Nick",IDC_STATIC,158,16,75,8,0,WS_EX_TRANSPARENT EDITTEXT IDC_NICK,237,13,63,13,ES_AUTOHSCROLL + RTEXT "Alternative nick",IDC_STATIC,158,34,75,8,0,WS_EX_TRANSPARENT EDITTEXT IDC_NICK2,237,32,63,13,ES_AUTOHSCROLL + RTEXT "Full name (e-mail)",IDC_STATIC,158,53,75,8,0,WS_EX_TRANSPARENT EDITTEXT IDC_NAME,237,51,63,13,ES_AUTOHSCROLL + RTEXT "User ID (Ident)",IDC_STATIC,158,73,75,8,0,WS_EX_TRANSPARENT EDITTEXT IDC_USERID,237,71,63,13,ES_AUTOHSCROLL + GROUPBOX "Ident",IDC_STATIC,150,92,154,42 CONTROL "Enable",IDC_IDENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,106,46,15 + LTEXT "System",IDC_STATIC,210,98,39,8,0,WS_EX_TRANSPARENT EDITTEXT IDC_IDENTSYSTEM,210,106,39,12,ES_AUTOHSCROLL + LTEXT "Port",IDC_STATIC,256,98,35,8,0,WS_EX_TRANSPARENT EDITTEXT IDC_IDENTPORT,256,106,39,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "only while connecting",IDC_IDENT_TIMED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,171,120,124,11 + GROUPBOX "Other",IDC_STATIC,2,134,302,92 CONTROL "Force visible (-i)",IDC_FORCEVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,145,134,10 CONTROL "Rejoin channel if kicked",IDC_REJOINONKICK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,156,134,10 CONTROL "Rejoin channels on reconnect",IDC_REJOINCHANNELS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,167,134,10 @@ -81,32 +99,14 @@ BEGIN CONTROL "'Old style' mode changes",IDC_OLDSTYLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,144,167,154,10 CONTROL "Update online statuses for users",IDC_ONLINENOTIF, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,144,178,154,10 + RTEXT "Check every (s):",IDC_STATIC,152,190,114,8 EDITTEXT IDC_ONLINETIMER,267,188,29,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT CONTROL "Spin1",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,284,188,12,14 CONTROL "Update statuses in channel nick list",IDC_CHANNELAWAY, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,144,200,154,10 + RTEXT "Don't check if more than (users):",IDC_STATIC,152,212,114,8 EDITTEXT IDC_LIMIT,267,210,29,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT CONTROL "Spin2",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,284,209,11,14 - CONTROL "Enable",IDC_STARTUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,11,73,10 - CONTROL "Internet address",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,10,45,81,8,WS_EX_TRANSPARENT - LTEXT "Port range",IDC_STATIC,10,67,69,8,0,WS_EX_TRANSPARENT - LTEXT "Nick",IDC_STATIC,158,16,72,8,0,WS_EX_TRANSPARENT - LTEXT "User ID (Ident)",IDC_STATIC,158,73,72,8,0,WS_EX_TRANSPARENT - LTEXT "Full name (e-mail)",IDC_STATIC,158,53,72,8,0,WS_EX_TRANSPARENT - LTEXT "Password",IDC_STATIC,10,90,125,8,0,WS_EX_TRANSPARENT - LTEXT "Server name",IDC_STATIC,10,22,125,8,0,WS_EX_TRANSPARENT - LTEXT "->",IDC_STATIC,71,75,8,8 - LTEXT "Alternative nick",IDC_STATIC,158,34,72,8,0,WS_EX_TRANSPARENT - GROUPBOX "Ident",IDC_STATIC,150,92,154,42 - LTEXT "System",IDC_STATIC,210,98,39,8,0,WS_EX_TRANSPARENT - LTEXT "Port",IDC_STATIC,256,98,35,8,0,WS_EX_TRANSPARENT - GROUPBOX "Default network",IDC_STATIC,2,0,142,134 - GROUPBOX "User info - Required",IDC_STATIC,150,0,154,90 - GROUPBOX "Other",IDC_STATIC,2,134,302,92 - LTEXT "Check every (s):",IDC_STATIC,152,190,114,8 - EDITTEXT IDC_SSL,107,53,28,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_TABSTOP,WS_EX_RIGHT - LTEXT "SSL",IDC_STATIC,107,45,28,8,0,WS_EX_TRANSPARENT - CONTROL "Don't check if more than (users):",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,152,212,114,8 END IDD_INFO DIALOGEX 0, 0, 267, 214 @@ -173,22 +173,22 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Perform",IDC_STATIC,4,4,136,152 - CONTROL "Enable",IDC_PERFORM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,18,107,10 - COMBOBOX IDC_PERFORMCOMBO,9,40,125,99,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_PERFORMEDIT,9,60,125,68,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL | WS_GROUP + CONTROL "Enable",IDC_PERFORM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,18,124,10 + COMBOBOX IDC_PERFORMCOMBO,10,40,124,99,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_PERFORMEDIT,10,60,124,68,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL | WS_GROUP CONTROL "&Set",IDC_ADD,"MButtonClass",WS_DISABLED | WS_TABSTOP,35,134,30,14,WS_EX_NOACTIVATE | 0x10000000L CONTROL "&Del",IDC_DELETE,"MButtonClass",WS_DISABLED | WS_TABSTOP,84,134,30,14,WS_EX_NOACTIVATE | 0x10000000L GROUPBOX "Alias",IDC_STATIC,144,4,157,122 - EDITTEXT IDC_ALIASEDIT,152,18,142,102,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL - LTEXT "Perform on event:",IDC_STATIC,16,32,110,8,0,WS_EX_TRANSPARENT + EDITTEXT IDC_ALIASEDIT,152,18,145,102,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL + LTEXT "Perform on event:",IDC_STATIC,10,32,124,8,0,WS_EX_TRANSPARENT GROUPBOX "Scripting support",IDC_STATIC,145,128,156,28 - CONTROL "Enable",IDC_SCRIPT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,140,126,10 + CONTROL "Enable",IDC_SCRIPT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,140,145,10 GROUPBOX "Other",IDC_STATIC,4,156,297,66 - LTEXT "Quit message:",IDC_STATIC,12,168,136,8 - EDITTEXT IDC_QUITMESSAGE,12,176,282,12,ES_AUTOHSCROLL - COMBOBOX IDC_CODEPAGE,148,192,146,79,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Server code page:",IDC_STATIC,12,194,130,8 - CONTROL "Enable UTF8 autodetection",IDC_UTF_AUTODETECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,208,282,10 + LTEXT "Quit message:",IDC_STATIC,10,166,287,8 + EDITTEXT IDC_QUITMESSAGE,10,176,287,12,ES_AUTOHSCROLL + COMBOBOX IDC_CODEPAGE,151,192,146,79,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + RTEXT "Server code page:",IDC_STATIC,12,194,133,8 + CONTROL "Enable UTF8 autodetection",IDC_UTF_AUTODETECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,208,287,10 END IDD_ADDSERVER DIALOGEX 0, 0, 182, 136 @@ -427,21 +427,21 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - COMBOBOX IDC_SERVERCOMBO,55,5,125,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SERVERCOMBO,55,5,123,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_SERVER,5,21,88,12,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP | NOT WS_TABSTOP EDITTEXT IDC_PORT,96,21,27,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_TABSTOP,WS_EX_RIGHT EDITTEXT IDC_PORT2,126,21,27,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_TABSTOP,WS_EX_RIGHT - EDITTEXT IDC_PASS,54,38,125,12,ES_PASSWORD | ES_AUTOHSCROLL + EDITTEXT IDC_PASS,55,38,123,12,ES_PASSWORD | ES_AUTOHSCROLL EDITTEXT IDC_NICK,87,64,91,13,ES_AUTOHSCROLL EDITTEXT IDC_NICK2,87,81,91,13,ES_AUTOHSCROLL EDITTEXT IDC_NAME,87,98,91,13,ES_AUTOHSCROLL EDITTEXT IDC_USERID,87,115,91,13,ES_AUTOHSCROLL - LTEXT "Server:",IDC_STATIC,5,7,45,8 - LTEXT "Password:",IDC_STATIC,6,41,43,8 - LTEXT "Nick",IDC_STATIC,8,66,77,8 - LTEXT "Alternate nick",IDC_STATIC,8,83,76,8 - LTEXT "Full name (e-mail)",IDC_STATIC,8,100,77,8 - LTEXT "User ID (Ident)",IDC_STATIC,8,117,74,8 + RTEXT "Server:",IDC_STATIC,5,7,45,8 + RTEXT "Password:",IDC_STATIC,5,41,45,8 + RTEXT "Nick",IDC_STATIC,5,66,79,8 + RTEXT "Alternative nick",IDC_STATIC,5,83,79,8 + RTEXT "Full name (e-mail)",IDC_STATIC,5,100,79,8 + RTEXT "User ID (Ident)",IDC_STATIC,5,117,79,8 EDITTEXT IDC_SSL,155,21,23,12,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_TABSTOP,WS_EX_RIGHT END @@ -462,7 +462,9 @@ BEGIN VERTGUIDE, 144 VERTGUIDE, 158 VERTGUIDE, 210 - VERTGUIDE, 229 + VERTGUIDE, 233 + VERTGUIDE, 237 + VERTGUIDE, 298 HORZGUIDE, 16 HORZGUIDE, 30 HORZGUIDE, 39 @@ -503,13 +505,15 @@ BEGIN IDD_PREFS_OTHER, DIALOG BEGIN LEFTMARGIN, 2 - RIGHTMARGIN, 291 + RIGHTMARGIN, 301 VERTGUIDE, 10 - VERTGUIDE, 128 + VERTGUIDE, 134 VERTGUIDE, 145 + VERTGUIDE, 152 VERTGUIDE, 220 VERTGUIDE, 262 VERTGUIDE, 283 + VERTGUIDE, 297 BOTTOMMARGIN, 217 HORZGUIDE, 6 HORZGUIDE, 28 @@ -670,6 +674,16 @@ BEGIN HORZGUIDE, 52 HORZGUIDE, 71 END + + IDD_ACCMGRUI, DIALOG + BEGIN + VERTGUIDE, 5 + VERTGUIDE, 50 + VERTGUIDE, 55 + VERTGUIDE, 84 + VERTGUIDE, 87 + VERTGUIDE, 178 + END END #endif // APSTUDIO_INVOKED diff --git a/protocols/IRCG/src/clist.cpp b/protocols/IRCG/src/clist.cpp index 077e325ed7..17373420c2 100644 --- a/protocols/IRCG/src/clist.cpp +++ b/protocols/IRCG/src/clist.cpp @@ -34,7 +34,7 @@ BOOL CIrcProto::CList_AddDCCChat(const CMString& name, const CMString& hostmask, if (hc && db_get_b(hc, "CList", "NotOnList", 0) == 0 && db_get_b(hc, "CList", "Hidden", 0) == 0) bFlag = true; - CMString contactname = name; contactname += _T(DCCSTRING); + CMString contactname = name; contactname += DCCSTRING; CONTACT user = { (TCHAR*)contactname.c_str(), NULL, NULL, false, false, true }; hContact = CList_AddContact(&user, false, false); diff --git a/protocols/IRCG/src/input.cpp b/protocols/IRCG/src/input.cpp index 3288a69a40..29d5b4c14b 100644 --- a/protocols/IRCG/src/input.cpp +++ b/protocols/IRCG/src/input.cpp @@ -677,7 +677,7 @@ BOOL CIrcProto::DoHardcodedCommand(CMString text, TCHAR* window, MCONTACT hConta ulAdr = ConvertIPToInteger(m_IPFromServer ? m_myHost : m_myLocalHost); if (ulAdr) { - CMString contact = two; contact += _T(DCCSTRING); + CMString contact = two; contact += DCCSTRING; CONTACT user = { (TCHAR*)contact.c_str(), NULL, NULL, false, false, true }; MCONTACT hContact = CList_AddContact(&user, false, false); setByte(hContact, "DCC", 1); diff --git a/protocols/IRCG/src/irc.h b/protocols/IRCG/src/irc.h index 6ba49149e2..27ef8bc750 100644 --- a/protocols/IRCG/src/irc.h +++ b/protocols/IRCG/src/irc.h @@ -87,10 +87,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define IRC_UM_DISCONNECT "/UMenuDisconnect" #define IRC_UM_IGNORE "/UMenuIgnore" -#define STR_QUITMESSAGE "\002Miranda NG!\002 Smaller, Faster, Easier. http://miranda-ng.org/" -#define STR_USERINFO "I'm a happy Miranda NG user! Get it here: http://miranda-ng.org/" -#define STR_AWAYMESSAGE "I'm away from the computer." // Default away -#define DCCSTRING " (DCC)" +#define STR_QUITMESSAGE _T("\002Miranda NG!\002 Smaller, Faster, Easier. http://miranda-ng.org/") +#define STR_USERINFO _T("I'm a happy Miranda NG user! Get it here: http://miranda-ng.org/") +#define STR_AWAYMESSAGE _T("I'm away from the computer.") // Default away +#define DCCSTRING _T(" (DCC)") #define SERVERSMODULE "IRC Servers" #define SERVERWINDOW _T("Network log") diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index 5a5f910aea..73c64b08ff 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -975,7 +975,7 @@ int __cdecl CIrcProto::SetAwayMsg(int status, const TCHAR* msg) ReplaceString(newStatus, _T("\r\n"), _T(" ")); if (m_statusMessage.IsEmpty() || msg == NULL || m_statusMessage != newStatus) { if (msg == NULL || *msg == 0) - m_statusMessage = _T(STR_AWAYMESSAGE); + m_statusMessage = STR_AWAYMESSAGE; else m_statusMessage = newStatus; diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp index 38b73b0617..0e725d7607 100644 --- a/protocols/IRCG/src/options.cpp +++ b/protocols/IRCG/src/options.cpp @@ -273,9 +273,9 @@ struct { UINT cpId; TCHAR *cpName; } static cpTable[] = static CCtrlCombo* sttCombo; -static BOOL CALLBACK sttLangAddCallback(CHAR *str) +static BOOL CALLBACK sttLangAddCallback(TCHAR *str) { - UINT cp = atoi(str); + UINT cp = _ttoi(str); CPINFOEX cpinfo; if (GetCPInfoEx(cp, 0, &cpinfo)) { TCHAR* b = _tcschr(cpinfo.CodePageName, '('); @@ -1035,11 +1035,10 @@ void COtherPrefsDlg::OnInitDialog() m_codepage.AddString(TranslateT("Default ANSI codepage"), CP_ACP); sttCombo = &m_codepage; - EnumSystemCodePagesA(sttLangAddCallback, CP_INSTALLED); + EnumSystemCodePages(sttLangAddCallback, CP_INSTALLED); - int i; - for (i = m_codepage.GetCount(); i >= 0; i--) { - if (m_codepage.GetItemData(i) == m_proto->getCodepage()) { + for (int i = m_codepage.GetCount(); i >= 0; i--) { + if (m_codepage.GetItemData(i) == m_proto->m_codepage) { m_codepage.SetCurSel(i); break; } @@ -1049,7 +1048,7 @@ void COtherPrefsDlg::OnInitDialog() if (m_proto->m_codepage == CP_UTF8) m_autodetect.Disable(); - for (i = 0; i < g_servers.getCount(); i++) { + for (int i = 0; i < g_servers.getCount(); i++) { SERVER_INFO& si = g_servers[i]; int idx = m_performCombo.FindStringA(si.m_group, -1, true); if (idx == CB_ERR) { @@ -1058,7 +1057,7 @@ void COtherPrefsDlg::OnInitDialog() } } - for (i = 0; i < SIZEOF(sttPerformEvents); i++) { + for (int i = 0; i < SIZEOF(sttPerformEvents); i++) { int idx = m_performCombo.InsertString(_A2T(sttPerformEvents[i]), i); addPerformComboValue(idx, sttPerformEvents[i]); } @@ -1704,9 +1703,9 @@ void CIrcProto::InitPrefs(void) ConnectSettings[3].defStr = _T("30"); ConnectSettings[4].defStr = _T("10"); - CtcpSettings[0].defStr = _T(STR_USERINFO); + CtcpSettings[0].defStr = STR_USERINFO; - OtherSettings[0].defStr = _T(STR_QUITMESSAGE); + OtherSettings[0].defStr = STR_QUITMESSAGE; ReadSettings(ConnectSettings, SIZEOF(ConnectSettings)); ReadSettings(CtcpSettings, SIZEOF(CtcpSettings)); diff --git a/protocols/IRCG/src/resource.h b/protocols/IRCG/src/resource.h index 9ac60a05f6..8727232122 100644 --- a/protocols/IRCG/src/resource.h +++ b/protocols/IRCG/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by D:\Myranda\protocols\IRCG\res\IRC.rc +// Used by ..\res\IRC.rc // #define ID_INFO_QUERY 3 #define IDD_PREFS_MAIN 101 -- cgit v1.2.3