diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-01-01 12:32:05 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-01-01 12:32:05 +0000 |
| commit | 055d4460e17344248c7364afc5d19deeda39d644 (patch) | |
| tree | e526bcd1496a0b3f7679278b9b7cc47c1e4d986a | |
| parent | e509920d44176bfba08b81fc4833e1c47d0ac66f (diff) | |
copyright update for year 2014
git-svn-id: http://svn.miranda-ng.org/main/trunk@7438 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
852 files changed, 3807 insertions, 3475 deletions
diff --git a/include/m_addcontact.h b/include/m_addcontact.h index be0e6a40ee..ffba5c2ca2 100644 --- a/include/m_addcontact.h +++ b/include/m_addcontact.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -61,5 +62,3 @@ typedef struct{ #define MS_ADDCONTACT_SHOW "AddContact/Show"
#endif // M_ADDCONTACT_H__
-
-
diff --git a/include/m_avatars.h b/include/m_avatars.h index 4a97194dbd..ce5fd20949 100644 --- a/include/m_avatars.h +++ b/include/m_avatars.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2012 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_awaymsg.h b/include/m_awaymsg.h index b53ff4f182..83d5cbc9f0 100644 --- a/include/m_awaymsg.h +++ b/include/m_awaymsg.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -45,4 +46,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #endif
#endif // M_AWAYMSG_H__
-
diff --git a/include/m_button.h b/include/m_button.h index 364915e91e..e0f0afa0b6 100644 --- a/include/m_button.h +++ b/include/m_button.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_button_int.h b/include/m_button_int.h index 9bdd651731..724b72eee6 100644 --- a/include/m_button_int.h +++ b/include/m_button_int.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -51,7 +52,7 @@ struct MButtonCtrl bIsThemed, // themed button
bIsSkinned, // skinned button
bSendOnDown; // sends BN_CLICKED on WM_LBUTTONDOWN
-
+
pfnPainterFunc fnPainter; // custom button painter
IAccPropServices* pAccPropServices;
diff --git a/include/m_clc.h b/include/m_clc.h index b7f6bf10f4..ac64caeae4 100644 --- a/include/m_clc.h +++ b/include/m_clc.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_clist.h b/include/m_clist.h index 2636f2881b..a09e85dd28 100644 --- a/include/m_clist.h +++ b/include/m_clist.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_clistint.h b/include/m_clistint.h index 25de86bda3..b0d49e935e 100644 --- a/include/m_clistint.h +++ b/include/m_clistint.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_clui.h b/include/m_clui.h index bbda841f01..07d9f9b5d8 100644 --- a/include/m_clui.h +++ b/include/m_clui.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -157,4 +158,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #endif // M_CLUI_H__
-
diff --git a/include/m_cluiframes.h b/include/m_cluiframes.h index 89b36c2f3c..fa82cc4a8b 100644 --- a/include/m_cluiframes.h +++ b/include/m_cluiframes.h @@ -1,6 +1,9 @@ /*
-Miranda ICQ: the free icq client for MS Windows
-Copyright (C) 2000-2 Richard Hughes, Roland Rabien & Tristan Van de Vreede
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-02 Richard Hughes, Roland Rabien & Tristan Van de Vreede
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/include/m_contacts.h b/include/m_contacts.h index dd14dfd39d..1e57e90ab2 100644 --- a/include/m_contacts.h +++ b/include/m_contacts.h @@ -1,5 +1,7 @@ /*
-Miranda IM
+
+Miranda NG: the free IM client for Microsoft* Windows*
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -110,4 +112,3 @@ typedef struct { #define MS_CONTACT_GETCONTACTINFO "Miranda/Contact/GetContactInfo"
#endif // M_CONTACTS_H__
-
diff --git a/include/m_core.h b/include/m_core.h index 8902bcd9f9..3491df1b57 100644 --- a/include/m_core.h +++ b/include/m_core.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -143,7 +144,7 @@ hContact was the last contact in the db or hContact was invalid. * DATABASE EVENTS
*/
-/*
+/*
Adds a new event to a contact's event list
Returns a handle to the newly added event, or NULL on failure
Triggers a db/event/added event just before it returns.
@@ -192,7 +193,7 @@ Events in a chain are sorted chronologically automatically MIR_CORE_DLL(HANDLE) db_event_first(HANDLE hContact);
-/*
+/*
Retrieves a handle to the first unread event in the chain for hContact
Returns the handle, or NULL if hContact is invalid or all its events have been
read
diff --git a/include/m_crypto.h b/include/m_crypto.h index 32b532f9b1..d4ab864c54 100644 --- a/include/m_crypto.h +++ b/include/m_crypto.h @@ -1,8 +1,8 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2010 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -64,7 +64,7 @@ typedef MICryptoEngine* (__cdecl *pfnCryptoProviderFactory)(void); #define CPF_UNICODE 1
#if defined(_UNICODE)
- #define CPF_TCHAR CPF_UNICODE
+ #define CPF_TCHAR CPF_UNICODE
#else
#define CPF_TCHAR 0
#endif
diff --git a/include/m_database.h b/include/m_database.h index f5a8c1d7da..b8e1e1f558 100644 --- a/include/m_database.h +++ b/include/m_database.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -571,7 +572,7 @@ __inline WORD DBGetContactSettingRangedWord(HANDLE hContact, const char *szModul return (wVal < minValue || wVal > maxValue) ? errorValue : wVal;
}
-__inline DWORD DBGetContactSettingRangedDword(HANDLE hContact, const char *szModule, const char *szSetting, DWORD errorValue, DWORD minValue, DWORD maxValue)
+__inline DWORD DBGetContactSettingRangedDword(HANDLE hContact, const char *szModule, const char *szSetting, DWORD errorValue, DWORD minValue, DWORD maxValue)
{
DWORD dwVal = db_get_dw(hContact, szModule, szSetting, errorValue);
return (dwVal < minValue || dwVal > maxValue) ? errorValue : dwVal;
diff --git a/include/m_db_int.h b/include/m_db_int.h index 4adc5212df..5c9c093f7d 100644 --- a/include/m_db_int.h +++ b/include/m_db_int.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_descbutton.h b/include/m_descbutton.h index bfe11ab53a..34406dcec5 100644 --- a/include/m_descbutton.h +++ b/include/m_descbutton.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2007 Artem Shpynov
-Copyright 2000-2007 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2007-12 Miranda ICQ/IM project,
+Copyright (c) 2007 Artem Shpynov
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_email.h b/include/m_email.h index c19979ed5e..ecbf27cb0c 100644 --- a/include/m_email.h +++ b/include/m_email.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -33,4 +34,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MS_EMAIL_SENDEMAIL "SREMail/SendCommand"
#endif // M_EMAIL_H__
-
diff --git a/include/m_errors.h b/include/m_errors.h index 86b053ec7d..cf6f198341 100644 --- a/include/m_errors.h +++ b/include/m_errors.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_extraicons.h b/include/m_extraicons.h index add2858e02..f6feb26397 100644 --- a/include/m_extraicons.h +++ b/include/m_extraicons.h @@ -1,21 +1,25 @@ /*
- Copyright (C) 2009 Ricardo Pescuma Domenecci
-
- This is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this file; see the file license.txt. If
- not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2009 Ricardo Pescuma Domenecci
+
+This is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this file; see the file license.txt. If
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
+*/
#ifndef __M_EXTRAICONS_H__
#define __M_EXTRAICONS_H__
diff --git a/include/m_file.h b/include/m_file.h index 7285078a64..98597bb745 100644 --- a/include/m_file.h +++ b/include/m_file.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -66,4 +67,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MS_FILE_GETRECEIVEDFILESFOLDER "SRFile/GetReceivedFilesFolder"
#endif // M_FILE_H__
-
diff --git a/include/m_findadd.h b/include/m_findadd.h index 9e7d170595..228125c91d 100644 --- a/include/m_findadd.h +++ b/include/m_findadd.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -32,4 +33,3 @@ returns 0 always #define MS_FINDADD_FINDADD "FindAdd/FindAddCommand"
#endif // M_FINDADD_H__
-
diff --git a/include/m_history.h b/include/m_history.h index dba50b83bc..a0c61f4fb4 100644 --- a/include/m_history.h +++ b/include/m_history.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -31,4 +32,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MS_HISTORY_SHOWCONTACTHISTORY "History/ShowContactHistory"
#endif // M_HISTORY_H__
-
diff --git a/include/m_hotkeys.h b/include/m_hotkeys.h index d15c14a993..33ebde9817 100644 --- a/include/m_hotkeys.h +++ b/include/m_hotkeys.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -69,7 +70,7 @@ Returns 0 on failure or hotkey atom id on success */
__forceinline INT_PTR Hotkey_Register(HOTKEYDESC *hk)
-{
+{
return CallService("CoreHotkeys/Register", (WPARAM)hLangpack, (LPARAM)hk);
}
diff --git a/include/m_icolib.h b/include/m_icolib.h index dcdb9082ee..4790a6bc10 100644 --- a/include/m_icolib.h +++ b/include/m_icolib.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_iconheader.h b/include/m_iconheader.h index 1cd1199093..a4bf1ff0c4 100644 --- a/include/m_iconheader.h +++ b/include/m_iconheader.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2007 Artem Shpynov
-Copyright 2000-2007 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-2007 Miranda ICQ/IM project,
+Copyright (c) 2007 Artem Shpynov
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_icq.h b/include/m_icq.h index 5478c09e00..3afb3b7b42 100644 --- a/include/m_icq.h +++ b/include/m_icq.h @@ -2,10 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright © 2001-2002 Jon Keating, Richard Hughes
-// Copyright © 2002-2004 Martin Öberg, Sam Kothari, Robert Rainwater
-// Copyright © 2004-2010 Joe Kucera
+// Copyright (c) 2000-01 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright (c) 2001-02 Jon Keating, Richard Hughes
+// Copyright (c) 2002-04 Martin Öberg, Sam Kothari, Robert Rainwater
+// Copyright (c) 2004-10 Joe Kucera
+// Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/include/m_idle.h b/include/m_idle.h index bdcf0b3c0f..6ff36c7d3b 100644 --- a/include/m_idle.h +++ b/include/m_idle.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2005 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-05 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -71,4 +72,3 @@ typedef struct { #define MS_IDLE_GETIDLEINFO "Miranda/Idle/GetInfo"
#endif // M_IDLE_H__
-
diff --git a/include/m_ignore.h b/include/m_ignore.h index c20a029502..0c1789a543 100644 --- a/include/m_ignore.h +++ b/include/m_ignore.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -61,4 +62,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #endif // M_IGNORE_H__
-
diff --git a/include/m_imgsrvc.h b/include/m_imgsrvc.h index e1627754f3..3857efd78b 100644 --- a/include/m_imgsrvc.h +++ b/include/m_imgsrvc.h @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2012 Miranda ICQ/IM project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_jabber.h b/include/m_jabber.h index dd1ed23084..4484baa87e 100644 --- a/include/m_jabber.h +++ b/include/m_jabber.h @@ -1,10 +1,12 @@ /*
-Jabber Protocol Plugin for Miranda IM
-Copyright ( C ) 2002-04 Santithorn Bunchua
-Copyright ( C ) 2005-08 George Hazan
-Copyright ( C ) 2007 Maxim Mluhov
-Copyright ( C ) 2008-09 Dmitriy Chervov
+Jabber Protocol Plugin for Miranda NG
+
+Copyright (c) 2002-04 Santithorn Bunchua
+Copyright (c) 2005-08 George Hazan
+Copyright (c) 2007 Maxim Mluhov
+Copyright (c) 2008-09 Dmitriy Chervov
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/include/m_json.h b/include/m_json.h index d381ab6f20..bb67088f79 100644 --- a/include/m_json.h +++ b/include/m_json.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_langpack.h b/include/m_langpack.h index 2edede4426..1e83530c4c 100644 --- a/include/m_langpack.h +++ b/include/m_langpack.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2012 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_message.h b/include/m_message.h index 897f4a5475..3fd5188fce 100644 --- a/include/m_message.h +++ b/include/m_message.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_modernopt.h b/include/m_modernopt.h index 02f2d1cdba..3e6038088c 100644 --- a/include/m_modernopt.h +++ b/include/m_modernopt.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2007 Artem Shpynov
-Copyright 2000-2007 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (ñ) 2000-10 Miranda ICQ/IM project,
+Copyright (c) 2007 Artem Shpynov
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_netlib.h b/include/m_netlib.h index 44b67a7124..d660336581 100644 --- a/include/m_netlib.h +++ b/include/m_netlib.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2012 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_options.h b/include/m_options.h index a0d3692945..58ccf222cb 100644 --- a/include/m_options.h +++ b/include/m_options.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_pluginupdater.h b/include/m_pluginupdater.h index 58bca0f7b3..24cfe89cb6 100644 --- a/include/m_pluginupdater.h +++ b/include/m_pluginupdater.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_png.h b/include/m_png.h index b1c4a6976f..8c837f78dc 100644 --- a/include/m_png.h +++ b/include/m_png.h @@ -1,6 +1,9 @@ /*
-Plugin of Miranda IM for reading/writing PNG images.
-Copyright (c) 2004-5 George Hazan (ghazan@postman.ru)
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2004-05 George Hazan (ghazan@postman.ru)
Portions of this code are gotten from the libpng codebase.
Copyright 2000, Willem van Schaik. For conditions of distribution and
diff --git a/include/m_protocols.h b/include/m_protocols.h index 0604217424..b34b8d8f50 100644 --- a/include/m_protocols.h +++ b/include/m_protocols.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_protoint.h b/include/m_protoint.h index 255cda85ff..93103629fa 100644 --- a/include/m_protoint.h +++ b/include/m_protoint.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -210,17 +211,17 @@ public: }
__forceinline HANDLE CreateProtoEvent(const char *name)
- { return ::ProtoCreateHookableEvent(this, name); }
+ { return ::ProtoCreateHookableEvent(this, name); }
typedef int (__cdecl T::*MyEventFunc)(WPARAM, LPARAM);
__forceinline void HookProtoEvent(const char *name, MyEventFunc pFunc)
- { ::ProtoHookEvent(this, name, (ProtoEventFunc)pFunc); }
+ { ::ProtoHookEvent(this, name, (ProtoEventFunc)pFunc); }
typedef void (__cdecl T::*MyThreadFunc)(void*);
__forceinline void ForkThread(MyThreadFunc pFunc, void *param)
- { ::ProtoForkThread(this, (ProtoThreadFunc)pFunc, param); }
+ { ::ProtoForkThread(this, (ProtoThreadFunc)pFunc, param); }
HANDLE __forceinline ForkThreadEx(MyThreadFunc pFunc, void *param, UINT *pThreadId)
- { return ::ProtoForkThreadEx(this, (ProtoThreadFunc)pFunc, param, pThreadId); }
+ { return ::ProtoForkThreadEx(this, (ProtoThreadFunc)pFunc, param, pThreadId); }
typedef INT_PTR (__cdecl T::*MyServiceFunc)(WPARAM, LPARAM);
__forceinline void CreateProtoService(const char *name, MyServiceFunc pFunc)
diff --git a/include/m_protomod.h b/include/m_protomod.h index 4f1ef4697d..efa76d729f 100644 --- a/include/m_protomod.h +++ b/include/m_protomod.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_protosvc.h b/include/m_protosvc.h index 2ad9c9d7c7..1d29112910 100644 --- a/include/m_protosvc.h +++ b/include/m_protosvc.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2009 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-09 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -740,7 +741,7 @@ Returns the result of db_event_add() #define MS_PROTO_RECVMSG "Proto/RecvMessage"
__forceinline INT_PTR Proto_RecvMessage(HANDLE hContact, PROTORECVEVENT *pcre)
-{
+{
CCSDATA ccs = { hContact, PSR_MESSAGE, 0, (LPARAM)pcre };
return CallService(MS_PROTO_RECVMSG, 0, (LPARAM)&ccs );
}
diff --git a/include/m_skin.h b/include/m_skin.h index 53bf6fc4a4..30833f39b6 100644 --- a/include/m_skin.h +++ b/include/m_skin.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_ssl.h b/include/m_ssl.h index 097847dfd5..53d9b731df 100644 --- a/include/m_ssl.h +++ b/include/m_ssl.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_string.h b/include/m_string.h index 13d77b4331..7551a29ade 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -1,3 +1,26 @@ +/*
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
#pragma once
#include <string.h>
@@ -49,7 +72,7 @@ struct CMStringData int nDataLength; // Length of currently used data in XCHARs (not including terminating null)
int nAllocLength; // Length of allocated data in XCHARs (not including terminating null)
long nRefs; // Reference count: negative == locked
-
+
__forceinline void* data() { return (this + 1); }
__forceinline void AddRef() { InterlockedIncrement(&nRefs); }
__forceinline bool IsLocked() const { return nRefs < 0; }
@@ -339,7 +362,7 @@ public: return m_pszData;
}
- void UnlockBuffer()
+ void UnlockBuffer()
{
CMStringData* pData = GetData();
pData->Unlock();
@@ -969,7 +992,7 @@ public: }
static void __stdcall ConvertToBaseType(LPWSTR pszDest, int nDestLength, LPCWSTR pszSrc, int nSrcLength = -1)
- {
+ {
if (nSrcLength == -1) { nSrcLength=1 + GetBaseTypeLength(pszSrc); }
// nLen is in wchar_ts
#if _MSC_VER >= 1400
@@ -1040,7 +1063,7 @@ public: {
}
- static void __stdcall ConvertToAnsi(LPWSTR /*psz*/, size_t)
+ static void __stdcall ConvertToAnsi(LPWSTR /*psz*/, size_t)
{
}
};
@@ -1108,7 +1131,7 @@ public: CThisSimpleString()
{
if (nLength > 0)
- {
+ {
//Convert ch to the BaseType
wchar_t pszCh[2] = { ch , 0 };
int nBaseTypeCharLen = 1;
@@ -1124,14 +1147,14 @@ public: PXSTR pszBuffer = this->GetBuffer(nLength*nBaseTypeCharLen);
if (nBaseTypeCharLen == 1)
{ //Optimization for a common case - wide char translates to 1 ansi/wide char.
- StringTraits::FloodCharacters(buffBaseTypeChar[0], nLength, pszBuffer);
+ StringTraits::FloodCharacters(buffBaseTypeChar[0], nLength, pszBuffer);
} else
{
XCHAR* p=pszBuffer;
for (int i=0 ; i < nLength ;i++)
{
for (int j=0 ; j < nBaseTypeCharLen ;++j)
- {
+ {
*p=buffBaseTypeChar[j];
++p;
}
@@ -1337,7 +1360,7 @@ public: PXSTR pszBuffer = this->GetBuffer(nNewLength);
- // move existing bytes down
+ // move existing bytes down
#if _MSC_VER >= 1400
memmove_s(pszBuffer+iIndex+1, (nNewLength-iIndex)*sizeof(XCHAR), pszBuffer+iIndex, (nNewLength-iIndex)*sizeof(XCHAR));
#else
@@ -1368,7 +1391,7 @@ public: nNewLength += nInsertLength;
PXSTR pszBuffer = this->GetBuffer(nNewLength);
- // move existing bytes down
+ // move existing bytes down
#if _MSC_VER >= 1400
memmove_s(pszBuffer+iIndex+nInsertLength, (nNewLength-iIndex-nInsertLength+1)*sizeof(XCHAR), pszBuffer+iIndex, (nNewLength-iIndex-nInsertLength+1)*sizeof(XCHAR));
memcpy_s(pszBuffer+iIndex, nInsertLength*sizeof(XCHAR), psz, nInsertLength*sizeof(XCHAR));
@@ -1469,9 +1492,9 @@ public: while((pszTarget = StringTraits::StringFindString(pszStart, pszOld)) != NULL)
{
int nBalance = nOldLength-int(pszTarget-pszBuffer+nSourceLen);
- memmove_s(pszTarget+nReplacementLen, nBalance*sizeof(XCHAR),
+ memmove_s(pszTarget+nReplacementLen, nBalance*sizeof(XCHAR),
pszTarget+nSourceLen, nBalance*sizeof(XCHAR));
- memcpy_s(pszTarget, nReplacementLen*sizeof(XCHAR),
+ memcpy_s(pszTarget, nReplacementLen*sizeof(XCHAR),
pszNew, nReplacementLen*sizeof(XCHAR));
pszStart = pszTarget+nReplacementLen;
pszTarget[nReplacementLen+nBalance] = 0;
@@ -1696,7 +1719,7 @@ public: PXSTR pszBuffer = this->GetBuffer(this->GetLength());
psz = pszBuffer+iFirst;
int nDataLength = this->GetLength()-iFirst;
- memmove_s(pszBuffer, (this->GetLength()+1)*sizeof(XCHAR),
+ memmove_s(pszBuffer, (this->GetLength()+1)*sizeof(XCHAR),
psz, (nDataLength+1)*sizeof(XCHAR));
this->ReleaseBufferSetLength(nDataLength);
}
@@ -1751,7 +1774,7 @@ public: if (pszLast != NULL)
{
- // truncate at left-most matching character
+ // truncate at left-most matching character
int iLast = int(pszLast-this->GetString());
this->Truncate(iLast);
}
@@ -1792,7 +1815,7 @@ public: if (pszLast != NULL)
{
- // truncate at left-most matching character
+ // truncate at left-most matching character
int iLast = int(pszLast-this->GetString());
this->Truncate(iLast);
}
@@ -1818,7 +1841,7 @@ public: PXSTR pszBuffer = this->GetBuffer(this->GetLength());
psz = pszBuffer+iFirst;
int nDataLength = this->GetLength()-iFirst;
- memmove_s(pszBuffer, (this->GetLength()+1)*sizeof(XCHAR),
+ memmove_s(pszBuffer, (this->GetLength()+1)*sizeof(XCHAR),
psz, (nDataLength+1)*sizeof(XCHAR));
this->ReleaseBufferSetLength(nDataLength);
}
@@ -1848,7 +1871,7 @@ public: PXSTR pszBuffer = this->GetBuffer(this->GetLength());
psz = pszBuffer+iFirst;
int nDataLength = this->GetLength()-iFirst;
- memmove_s(pszBuffer, (this->GetLength()+1)*sizeof(XCHAR),
+ memmove_s(pszBuffer, (this->GetLength()+1)*sizeof(XCHAR),
psz, (nDataLength+1)*sizeof(XCHAR));
this->ReleaseBufferSetLength(nDataLength);
}
@@ -1973,7 +1996,7 @@ public: int nCurrentLength = this->GetLength();
int nAppendLength = StringTraits::GetFormattedLength(pszFormat, args);
PXSTR pszBuffer = this->GetBuffer(nCurrentLength+nAppendLength);
- StringTraits::Format(pszBuffer+nCurrentLength,
+ StringTraits::Format(pszBuffer+nCurrentLength,
nAppendLength+1, pszFormat, args);
this->ReleaseBufferSetLength(nCurrentLength+nAppendLength);
}
diff --git a/include/m_system.h b/include/m_system.h index d55f7fb554..d330108e43 100644 --- a/include/m_system.h +++ b/include/m_system.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_system_cpp.h b/include/m_system_cpp.h index 2775f5220f..e06e0f12df 100644 --- a/include/m_system_cpp.h +++ b/include/m_system_cpp.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -206,7 +207,7 @@ template<class T> struct OBJLIST : public LIST<T> __inline int remove(T *p)
{
int i = getIndex( p );
- if ( i != -1 ) {
+ if ( i != -1 ) {
remove(i);
return 1;
}
diff --git a/include/m_timezones.h b/include/m_timezones.h index e9c103229a..3be1c57602 100644 --- a/include/m_timezones.h +++ b/include/m_timezones.h @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2010 Miranda ICQ/IM project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (ñ) 2000-10 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_url.h b/include/m_url.h index d544839c8a..ec39566b31 100644 --- a/include/m_url.h +++ b/include/m_url.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -32,4 +33,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MS_URL_SENDURL "SRUrl/SendCommand"
#endif // M_URL_H__
-
diff --git a/include/m_userinfo.h b/include/m_userinfo.h index 81bc9cd4cd..1e865480d8 100644 --- a/include/m_userinfo.h +++ b/include/m_userinfo.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_utils.h b/include/m_utils.h index 17640c6d32..a400842fa3 100644 --- a/include/m_utils.h +++ b/include/m_utils.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2012 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_xml.h b/include/m_xml.h index 06231a75e2..b6895978ab 100644 --- a/include/m_xml.h +++ b/include/m_xml.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -42,27 +43,27 @@ typedef enum /// Enumeration for XML parse errors.
typedef enum XMLError
{
- eXMLErrorNone = 0,
- eXMLErrorMissingEndTag,
- eXMLErrorNoXMLTagFound,
- eXMLErrorEmpty,
- eXMLErrorMissingTagName,
- eXMLErrorMissingEndTagName,
- eXMLErrorUnmatchedEndTag,
- eXMLErrorUnmatchedEndClearTag,
- eXMLErrorUnexpectedToken,
- eXMLErrorNoElements,
- eXMLErrorFileNotFound,
- eXMLErrorFirstTagNotFound,
- eXMLErrorUnknownCharacterEntity,
- eXMLErrorCharacterCodeAbove255,
- eXMLErrorCharConversionError,
- eXMLErrorCannotOpenWriteFile,
- eXMLErrorCannotWriteFile,
-
- eXMLErrorBase64DataSizeIsNotMultipleOf4,
- eXMLErrorBase64DecodeIllegalCharacter,
- eXMLErrorBase64DecodeTruncatedData,
+ eXMLErrorNone = 0,
+ eXMLErrorMissingEndTag,
+ eXMLErrorNoXMLTagFound,
+ eXMLErrorEmpty,
+ eXMLErrorMissingTagName,
+ eXMLErrorMissingEndTagName,
+ eXMLErrorUnmatchedEndTag,
+ eXMLErrorUnmatchedEndClearTag,
+ eXMLErrorUnexpectedToken,
+ eXMLErrorNoElements,
+ eXMLErrorFileNotFound,
+ eXMLErrorFirstTagNotFound,
+ eXMLErrorUnknownCharacterEntity,
+ eXMLErrorCharacterCodeAbove255,
+ eXMLErrorCharConversionError,
+ eXMLErrorCannotOpenWriteFile,
+ eXMLErrorCannotWriteFile,
+
+ eXMLErrorBase64DataSizeIsNotMultipleOf4,
+ eXMLErrorBase64DecodeIllegalCharacter,
+ eXMLErrorBase64DecodeTruncatedData,
eXMLErrorBase64DecodeBufferTooSmall
} XMLError;
diff --git a/include/m_xstatus.h b/include/m_xstatus.h index 24011592f6..4d904fcd03 100644 --- a/include/m_xstatus.h +++ b/include/m_xstatus.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/newpluginapi.h b/include/newpluginapi.h index 8ba459b730..90e4ce1eec 100644 --- a/include/newpluginapi.h +++ b/include/newpluginapi.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -79,7 +80,7 @@ typedef struct _MUUID { #define MIID_SERVICEMODE {0x8a92c026, 0x953a, 0x4f5f, { 0x99, 0x21, 0xf2, 0xc2, 0xdc, 0x19, 0x5e, 0xc5}}
-/* Each service mode plugin must implement MS_SERVICEMODE_LAUNCH
+/* Each service mode plugin must implement MS_SERVICEMODE_LAUNCH
This service might return one of the following values:
SERVICE_CONTINUE - load Miranda normally, like there's no service plugins at all
SERVICE_ONLYDB - load database and then execute service plugin only
diff --git a/include/statusmodes.h b/include/statusmodes.h index 2120f2d979..3c287191bc 100644 --- a/include/statusmodes.h +++ b/include/statusmodes.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -48,5 +49,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MAX_STATUS_COUNT (ID_STATUS_OUTTOLUNCH-ID_STATUS_OFFLINE+1)
#endif // STATUSMODES_H__
-
-
diff --git a/include/win2k.h b/include/win2k.h index 00db8cbb09..791e11ada9 100644 --- a/include/win2k.h +++ b/include/win2k.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/!Deprecated/Db3x/src/commonheaders.h b/plugins/!Deprecated/Db3x/src/commonheaders.h index 562cea5b7f..b97a18157f 100644 --- a/plugins/!Deprecated/Db3x/src/commonheaders.h +++ b/plugins/!Deprecated/Db3x/src/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (ñ) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/!Deprecated/Db3x/src/dbcache3x.cpp b/plugins/!Deprecated/Db3x/src/dbcache3x.cpp index 5688ce0a53..aeebdf033d 100644 --- a/plugins/!Deprecated/Db3x/src/dbcache3x.cpp +++ b/plugins/!Deprecated/Db3x/src/dbcache3x.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (ñ) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -37,7 +38,7 @@ int CDb3x::FindLRUSection(void) DWORD lowestLastUse = cacheSectionInfo[0].lastUsed;
for (int i = 1; i < CACHESECTIONCOUNT; i++)
if (cacheSectionInfo[i].lastUsed < lowestLastUse) {
- lru = i;
+ lru = i;
lowestLastUse = cacheSectionInfo[i].lastUsed;
}
return lru;
diff --git a/plugins/!Deprecated/Db3x/src/dbintf3x.cpp b/plugins/!Deprecated/Db3x/src/dbintf3x.cpp index 4deeed332a..c1b629599d 100644 --- a/plugins/!Deprecated/Db3x/src/dbintf3x.cpp +++ b/plugins/!Deprecated/Db3x/src/dbintf3x.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/!Deprecated/Db3x/src/dbintf3x.h b/plugins/!Deprecated/Db3x/src/dbintf3x.h index eaeb80b167..caf5ecf9d5 100644 --- a/plugins/!Deprecated/Db3x/src/dbintf3x.h +++ b/plugins/!Deprecated/Db3x/src/dbintf3x.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/!Deprecated/Db3x/src/init.cpp b/plugins/!Deprecated/Db3x/src/init.cpp index 9b0e5d81be..e3a01ab40d 100644 --- a/plugins/!Deprecated/Db3x/src/init.cpp +++ b/plugins/!Deprecated/Db3x/src/init.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/!Deprecated/Db3x/src/stdafx.cpp b/plugins/!Deprecated/Db3x/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/!Deprecated/Db3x/src/stdafx.cpp +++ b/plugins/!Deprecated/Db3x/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/!Deprecated/Db3x/src/version.h b/plugins/!Deprecated/Db3x/src/version.h index 3c8bef20fa..d64f0213d2 100644 --- a/plugins/!Deprecated/Db3x/src/version.h +++ b/plugins/!Deprecated/Db3x/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG project"
#define __AUTHOREMAIL "ghazan@miranda.im"
#define __AUTHORWEB "http://miranda-ng.org/p/Dbx_3x/"
-#define __COPYRIGHT "© 2012-13 Miranda NG project"
+#define __COPYRIGHT "© 2012-14 Miranda NG project"
diff --git a/plugins/!Deprecated/FingerPrintModPlus/src/stdafx.cpp b/plugins/!Deprecated/FingerPrintModPlus/src/stdafx.cpp index 199436b7ed..c54e72861c 100644 --- a/plugins/!Deprecated/FingerPrintModPlus/src/stdafx.cpp +++ b/plugins/!Deprecated/FingerPrintModPlus/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/!Deprecated/MagneticWindows/src/stdafx.cpp b/plugins/!Deprecated/MagneticWindows/src/stdafx.cpp index 5fe904d242..7115a9db5e 100644 --- a/plugins/!Deprecated/MagneticWindows/src/stdafx.cpp +++ b/plugins/!Deprecated/MagneticWindows/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/!Deprecated/W7UI/src/headers.h b/plugins/!Deprecated/W7UI/src/headers.h index 7d28902466..560e326e0d 100644 --- a/plugins/!Deprecated/W7UI/src/headers.h +++ b/plugins/!Deprecated/W7UI/src/headers.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (ñ) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
diff --git a/plugins/!Deprecated/W7UI/src/main.cpp b/plugins/!Deprecated/W7UI/src/main.cpp index 4eca2bde5a..17c810d2ea 100644 --- a/plugins/!Deprecated/W7UI/src/main.cpp +++ b/plugins/!Deprecated/W7UI/src/main.cpp @@ -1,7 +1,7 @@ /*
Miranda core extensions
-Copyright 2000-2007 Miranda ICQ/IM project,
+Copyright (c) 2000-07 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/newpluginapi.h b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/newpluginapi.h index bd937757f8..6a2a200a41 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/newpluginapi.h +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/newpluginapi.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -197,7 +198,7 @@ typedef struct { #define SetHookDefaultForHookableEvent(a,b) pluginLink->SetHookDefaultForHookableEvent(a,b)
#define CreateServiceFunctionParam(a,b,c) pluginLink->CreateServiceFunctionParam(a,b,c)
#define NotifyEventHooksDirect(a,b,c) pluginLink->NotifyEventHooksDirect(a,b,c)
- #if MIRANDA_VER >= 0x800
+ #if MIRANDA_VER >= 0x800
#define CallProtoService(a,b,c,d) pluginLink->CallProtoService(a,b,c,d)
#define CallContactService(a,b,c,d) pluginLink->CallContactService(a,b,c,d)
#define HookEventParam(a,b,c) pluginLink->HookEventParam(a,b,c)
diff --git a/plugins/!NotAdopted/SmartAutoAway/autoaway.cpp b/plugins/!NotAdopted/SmartAutoAway/autoaway.cpp index 817e4b2369..1480bdc90f 100644 --- a/plugins/!NotAdopted/SmartAutoAway/autoaway.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/autoaway.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2006 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-06 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -37,7 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //#define ME_IDLE_CHANGED "Miranda/SmartIdle/Changed"
//static HANDLE hIdleEvent = NULL;
-
+
#define allprotomodes 0x03FF //0000 0011 1111 1111;
#define aa_OnlyIfBitsDefault 0x01BB01B8 //2 x 0000 0001 1011 1011;
@@ -120,7 +121,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) } else { //... lite if IDF_LONG is not set
if (curIdleStatus > 0) return 0; // we are already sleeping...
curIdleStatus = 1;
- }
+ }
} else { // we are going to awake
if (curIdleStatus == 0) return 0; // we are already awake...
curIdleStatus = 0;
@@ -132,17 +133,17 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) db_set_dw(NULL,AA_MODULE,AA_LASTIDLETIME,(DWORD)lastIdleEventTime);
} }
switch (curIdleStatus) {
- case 0:
+ case 0:
xModifyMenu(0,CMIF_CHECKED);
xModifyMenu(1,0);
xModifyMenu(2,0);
break;
- case 1:
+ case 1:
xModifyMenu(0,0);
xModifyMenu(1,CMIF_CHECKED);
xModifyMenu(2,0);
break;
- case 2:
+ case 2:
xModifyMenu(0,0);
xModifyMenu(1,CMIF_GRAYED);
xModifyMenu(2,CMIF_CHECKED);
@@ -159,7 +160,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) if (isStatusLocked) newStatus = reqStatus[j];
else switch (curIdleStatus) {
case 1 : { //sleeping lite
- if ( GetBits(awayStatusesPerm[j],maskIsShortAwayEnabled)){
+ if ( GetBits(awayStatusesPerm[j],maskIsShortAwayEnabled)){
int bits = 1<<(reqStatusInd);
BOOL permit = GetBits(onlyIfBitsPerm[j], bits);
if ( permit ) {
@@ -176,7 +177,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) continue;
}
- } else continue;
+ } else continue;
break;
}
case 2 : { //sleeping deeply
@@ -196,7 +197,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) #endif
continue;
}
- } else continue;
+ } else continue;
break;
}
case 0: { //wakening up
@@ -245,7 +246,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, newStatus, 0),newStatus);
CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)str);
#endif
- if ( CallProtoService(accounts[j]->szModuleName, PS_GETSTATUS, 0, 0) != newStatus ) {
+ if ( CallProtoService(accounts[j]->szModuleName, PS_GETSTATUS, 0, 0) != newStatus ) {
//if (db_get_b( NULL, accounts[j]->szModuleName, , "LockMainStatus", 0 ))
// continue; //szName
@@ -268,7 +269,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)str);
#endif
} else if (messCaps[j] && !(lParam&IDF_PRIVACY)){//setting the statusMessage if protocol supports AND privacy is disabled
- TCHAR * awayMsg=0;
+ TCHAR * awayMsg=0;
int specificMsg = messCaps[j] & Proto_Status2Flag(newStatus);
switch (curIdleStatus) {
@@ -289,7 +290,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) } else {
#ifdef UNICODE
if (HasAwayMessageW){
- awayMsg = (TCHAR *) CallService(MS_AWAYMSG_GETSTATUSMSGW, (WPARAM) newStatus, 0);
+ awayMsg = (TCHAR *) CallService(MS_AWAYMSG_GETSTATUSMSGW, (WPARAM) newStatus, 0);
} else {
char *temp=(char *)CallService(MS_AWAYMSG_GETSTATUSMSG, (WPARAM) newStatus, 0);
if ((int)temp == CALLSERVICE_NOTFOUND) awayMsg = 0;
@@ -308,7 +309,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) #ifdef AALOG
{
char str[1000];
- sprintf(str,"%s: Specific Status Message is %s",accounts[j]->szModuleName,
+ sprintf(str,"%s: Specific Status Message is %s",accounts[j]->szModuleName,
specificMsg?"Enabled":"Disabled");
CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)str);
sprintf(str,"%s: Going to %s (%d); StatusMessage is: %s", accounts[j]->szModuleName,CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, newStatus, 0),newStatus,
@@ -327,7 +328,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) CallProtoService(accounts[j]->szModuleName, PS_SETAWAYMSG, newStatus, (LPARAM) awayMsg);
#endif
if (awayMsg) {
-#ifdef AALOG
+#ifdef AALOG
{char str[1000];
sprintf(str,"%s: Cleaning after MS_AWAYMSG_GETSTATUSMSG: %s",accounts[j]->szModuleName,awayMsg);
CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)str);}
@@ -335,7 +336,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) mir_free(awayMsg);
}
if ((curIdleStatus==0) && (GetBits(idleMessOpts[j],IdleMessOptsMaskRstHere)>0) && /*!starting &&*/ specificMsg){
-#ifdef AALOG
+#ifdef AALOG
char str[1000];
sprintf(str,"%s: Scheduling \"ResetDefaultStatusMessage\" after %d seconds",accounts[j]->szModuleName,GetBits(idleMessOpts[j],IdleMessOptsMaskRstHereDelay));
CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)str);
@@ -368,7 +369,7 @@ extern int StatusModeChangeEvent(WPARAM wParam,LPARAM lParam) sprintf(log,"Status Mode change event: %s: %s\n\n",lParam,CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, wParam, 0));
CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)log);
}
-#endif
+#endif
if (lParam){
for (j = 0 ; j < protoCount ; j++) {
//if ( accounts[j]->type != PROTOTYPE_PROTOCOL ) continue;
@@ -442,7 +443,7 @@ int ProtoAckEvent(WPARAM wParam,LPARAM lParam) #endif
char str[1024];
int j = 0;
- ACKDATA * ack = (ACKDATA*) lParam;
+ ACKDATA * ack = (ACKDATA*) lParam;
for (j = 0 ; j < protoCount ; j++) /*if (accounts[j]->type==PROTOTYPE_PROTOCOL)*/if (accounts[j]->bIsEnabled) if (strcmp(ack->szModule,accounts[j]->szModuleName)==0){
if (ack->type==ACKTYPE_STATUS) {
// MessageBox( 0,CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)ack->lParam, 0),accounts[j]->szModuleName,0);
@@ -455,7 +456,7 @@ int ProtoAckEvent(WPARAM wParam,LPARAM lParam) if (strcmp(ack->szModule,str)==0){
SetDlgItems(theDialog,GetCourSelProtocol(coursel));
// SendDlgItemMessage(theDialog, IDC_COURSTATUSLABEL, WM_SETTEXT, 0,
-// (LPARAM)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)courStatus[j], 0));
+// (LPARAM)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)courStatus[j], 0));
}
}
}
@@ -472,23 +473,23 @@ int ProtoAckEvent(WPARAM wParam,LPARAM lParam) // if (theDialog) SendDlgItemMessage(theDialog, 40202, WM_SETTEXT, 0,(LPARAM)str);
sprintf(str,"%d",ack->type);
sprintf(log,"%stype: %s;",log,str);
-// if (theDialog) SendDlgItemMessage(theDialog, 40203, WM_SETTEXT, 0,str);
+// if (theDialog) SendDlgItemMessage(theDialog, 40203, WM_SETTEXT, 0,str);
sprintf(str,"%d",ack->result);
sprintf(log,"%s result: %s;",log,str);
-// if (theDialog) SendDlgItemMessage(theDialog, 40204, WM_SETTEXT, 0,str);
+// if (theDialog) SendDlgItemMessage(theDialog, 40204, WM_SETTEXT, 0,str);
sprintf(str,"%d(%s)",ack->hProcess,
CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)ack->hProcess, 0));
sprintf(log,"%s hProcess: %s;",log,str);
-// if (theDialog) SendDlgItemMessage(theDialog, 40205, WM_SETTEXT, 0,str);
+// if (theDialog) SendDlgItemMessage(theDialog, 40205, WM_SETTEXT, 0,str);
sprintf(str,"%d(%s)",ack->lParam,
CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)ack->lParam, 0));
sprintf(log,"%s lParam: %s;",log,str);
-// if (theDialog) SendDlgItemMessage(theDialog, 40206, WM_SETTEXT, 0,str);
+// if (theDialog) SendDlgItemMessage(theDialog, 40206, WM_SETTEXT, 0,str);
CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)log);
#endif
return 0;
}
-
+
int SimulateIdle(int idlstatus)
{
@@ -502,7 +503,7 @@ int SimulateIdle(int idlstatus) }
if (idleOptsPerm&IdleBitsPrivate) flags |= IDF_PRIVACY;
isCurrentlyIdle = idlstatus;
- NotifyEventHooks( hIdleEvent, 0, flags );
+ NotifyEventHooks( hIdleEvent, 0, flags );
return 0;
}
@@ -516,12 +517,12 @@ LRESULT SetDlgItemsAA(HWND hwndDlg, int coursel){ EnableWindow(GetDlgItem(hwndDlg, IDC_AALONGSTATUS), enabledLong);
CheckDlgButton(hwndDlg, IDC_AASHORTIDLE, enabledShort?BST_CHECKED:BST_UNCHECKED );
CheckDlgButton(hwndDlg, IDC_AALONGIDLE, enabledLong?BST_CHECKED:BST_UNCHECKED );
-
+
SendDlgItemMessage(hwndDlg, IDC_AASTATUS, CB_RESETCONTENT, 0, 0);
SendDlgItemMessage(hwndDlg, IDC_AALONGSTATUS, CB_RESETCONTENT, 0, 0);
for (i=0;i<numStatuses;i++){
if (StatusToProtoIndex(aa_Status[i],protoModes[coursel])){
- // short idle flags
+ // short idle flags
SendDlgItemMessage(hwndDlg, IDC_AASTATUS, CB_ADDSTRING, 0, (LPARAM)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)aa_Status[i], GSMDF_TCHAR) );
// long idle flags
SendDlgItemMessage(hwndDlg, IDC_AALONGSTATUS, CB_ADDSTRING, 0, (LPARAM)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION,(WPARAM)aa_Status[i], GSMDF_TCHAR) );
@@ -572,7 +573,7 @@ INT_PTR CALLBACK DlgProcOptsAA(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa int thebit = numStatuses-StatusToProtoIndex(LOWORD(lParam),allprotomodes);
int value = IsDlgButtonChecked(hwndDlg, LOWORD(lParam)+t)==BST_CHECKED;
thebit = 1<<(thebit+t);
- onlyIfBits[courProtocolSelection] =
+ onlyIfBits[courProtocolSelection] =
SetBits(onlyIfBits[courProtocolSelection],
thebit,
value);
@@ -587,7 +588,7 @@ INT_PTR CALLBACK DlgProcOptsAA(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa awayStatuses[courProtocolSelection] = (short)SetBits(awayStatuses[courProtocolSelection],maskShortAwayStatus,awStInd);
} else if (lParam == IDC_AALONGSTATUS) {
awayStatuses[courProtocolSelection] = (short)SetBits(awayStatuses[courProtocolSelection],maskLongAwayStatus,awStInd);
- }
+ }
#ifdef _DEBUG
else MessageBoxA(hwndDlg,"Came From Long Place","WM_USER+3",0)
#endif //_DEBUG
@@ -603,29 +604,29 @@ INT_PTR CALLBACK DlgProcOptsAA(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa SendMessage(hwndDlg, WM_USER+1,0,0);
break;
}
- case ID_STATUS_AWAY:
+ case ID_STATUS_AWAY:
case ID_STATUS_DND:
- case ID_STATUS_NA:
+ case ID_STATUS_NA:
case ID_STATUS_OCCUPIED:
- case ID_STATUS_INVISIBLE:
- case ID_STATUS_ONTHEPHONE:
+ case ID_STATUS_INVISIBLE:
+ case ID_STATUS_ONTHEPHONE:
case ID_STATUS_OUTTOLUNCH:
case ID_STATUS_ONLINE:
- case ID_STATUS_FREECHAT:
+ case ID_STATUS_FREECHAT:
case ID_STATUS_OFFLINE:
{
SendMessage(hwndDlg, WM_USER+2,0,wParam);
break;
}
- case ID_STATUS_AWAY+16:
+ case ID_STATUS_AWAY+16:
case ID_STATUS_DND+16:
- case ID_STATUS_NA+16:
+ case ID_STATUS_NA+16:
case ID_STATUS_OCCUPIED+16:
- case ID_STATUS_INVISIBLE+16:
- case ID_STATUS_ONTHEPHONE+16:
+ case ID_STATUS_INVISIBLE+16:
+ case ID_STATUS_ONTHEPHONE+16:
case ID_STATUS_OUTTOLUNCH+16:
case ID_STATUS_ONLINE+16:
- case ID_STATUS_FREECHAT+16:
+ case ID_STATUS_FREECHAT+16:
case ID_STATUS_OFFLINE+16:
{
SendMessage(hwndDlg, WM_USER+2,0,(wParam-16)|0x00010000);
@@ -660,6 +661,3 @@ INT_PTR CALLBACK DlgProcOptsAA(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa }
return FALSE;
}
-
-
-
diff --git a/plugins/!NotAdopted/SmartAutoAway/dlgproc.cpp b/plugins/!NotAdopted/SmartAutoAway/dlgproc.cpp index 7a8865b89f..bf6b3f40e0 100644 --- a/plugins/!NotAdopted/SmartAutoAway/dlgproc.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/dlgproc.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2006 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-06 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -28,8 +29,8 @@ INT_PTR CALLBACK DlgProcAutoAwayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR static short int tabprotosel;
switch (msg)
{
- case WM_INITDIALOG:
- {
+ case WM_INITDIALOG:
+ {
short int t,p,protoListed;
TCITEM tci;
RECT theTabSpace;
@@ -66,12 +67,12 @@ INT_PTR CALLBACK DlgProcAutoAwayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR SetDlgItems(hwndDlg, courProtocolSelection = GetCourSelProtocol(p));
tci.mask = TCIF_PARAM|TCIF_TEXT;
-
+
#ifdef SAA_PLUGIN
theDialogAA = CreateDialog(g_hInst,MAKEINTRESOURCE(IDD_OPT_SAA_AA), hwndDlg, DlgProcOptsAA);
#else
theDialogAA = CreateDialog(GetModuleHandle(NULL),MAKEINTRESOURCE(IDD_OPT_SAA_AA), hwndDlg, DlgProcOptsAA);
-#endif
+#endif
tci.lParam = (LPARAM)theDialogAA;
tci.pszText = TranslateT("Statuses");
GetClientRect(theDialogAA,&rcClient);
@@ -81,7 +82,7 @@ INT_PTR CALLBACK DlgProcAutoAwayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR rcClient.right,rcClient.bottom,1);
ShowWindow((HWND)tci.lParam, (t==0)?SW_SHOW:SW_HIDE);
-
+
#ifdef SAA_PLUGIN
theDialogIdle = CreateDialog(g_hInst,MAKEINTRESOURCE(IDD_OPT_SAA_IDLE), hwndDlg, DlgProcOptsIdle);
#else
@@ -142,7 +143,7 @@ INT_PTR CALLBACK DlgProcAutoAwayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR int cour = SendDlgItemMessage(hwndDlg, IDC_AAPROTOCOL, CB_GETCURSEL, 0, 0);
courProtocolSelection = GetCourSelProtocol(cour);
if ( HIWORD(wParam) != CBN_SELCHANGE ) return TRUE;
- db_set_w(NULL, AA_MODULE, AA_PROTOSELECTION,
+ db_set_w(NULL, AA_MODULE, AA_PROTOSELECTION,
(unsigned short)(tabprotosel=courProtocolSelection|(tabprotosel&0xFF00)));
SetDlgItems(hwndDlg, courProtocolSelection);
SetDlgItemsReconnect(theDialogReconnect,courProtocolSelection);
@@ -246,7 +247,7 @@ INT_PTR CALLBACK DlgProcAutoAwayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR TCITEM tci;
tci.mask = TCIF_PARAM;
TabCtrl_GetItem(GetDlgItem(hwndDlg,IDC_OPT_SAA_TAB),TabCtrl_GetCurSel(GetDlgItem(hwndDlg,IDC_OPT_SAA_TAB)),&tci);
- ShowWindow((HWND)tci.lParam,SW_HIDE);
+ ShowWindow((HWND)tci.lParam,SW_HIDE);
}
break;
case TCN_SELCHANGE:
@@ -256,9 +257,9 @@ INT_PTR CALLBACK DlgProcAutoAwayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR tci.mask = TCIF_PARAM;
t = TabCtrl_GetCurSel(GetDlgItem(hwndDlg,IDC_OPT_SAA_TAB));
TabCtrl_GetItem(GetDlgItem(hwndDlg,IDC_OPT_SAA_TAB),t,&tci);
- db_set_w(NULL, AA_MODULE, AA_PROTOSELECTION,
+ db_set_w(NULL, AA_MODULE, AA_PROTOSELECTION,
(unsigned short)(tabprotosel=(t<<8)|(tabprotosel&0xF0FF)));
- ShowWindow((HWND)tci.lParam,SW_SHOW);
+ ShowWindow((HWND)tci.lParam,SW_SHOW);
{ BOOL enableW = (tci.lParam!=(long)theDialogIdle);
EnableWindow(GetDlgItem(hwndDlg,IDC_AAPROTOCOL),enableW);
EnableWindow(GetDlgItem(hwndDlg,IDC_APPLYTOALL),enableW);
@@ -269,13 +270,10 @@ INT_PTR CALLBACK DlgProcAutoAwayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR break;
}
}//end case(LPNMHDR)lParam)->idFrom
-
+
}
//WTF??? if(wParam!=0x12345678) SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
- break;
+ break;
}
return FALSE;
}
-
-
-
diff --git a/plugins/!NotAdopted/SmartAutoAway/globals.cpp b/plugins/!NotAdopted/SmartAutoAway/globals.cpp index 396b04e842..93452a9216 100644 --- a/plugins/!NotAdopted/SmartAutoAway/globals.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/globals.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2006 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-06 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -110,4 +111,3 @@ HOTKEYDESC hotkeydescs[] = { {sizeof(HOTKEYDESC), "saa_belongidle", "Long Idle", SECTIONNAME, AA_IDLE_BELONGIDLESERVICE, 0, 0},
{sizeof(HOTKEYDESC), "saa_reconnect", "Reconnect", SECTIONNAME, AA_IDLE_RECONNECTSERVICE, 0, 0},
};
-
diff --git a/plugins/!NotAdopted/SmartAutoAway/idle.cpp b/plugins/!NotAdopted/SmartAutoAway/idle.cpp index 3a12ff2967..9b3a1b397a 100644 --- a/plugins/!NotAdopted/SmartAutoAway/idle.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/idle.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2006 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-06 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -118,7 +119,7 @@ static BOOL idleDialogInInit = FALSE; #ifdef UNICODE
TCHAR *awayMsg=0;
if (HasAwayMessageW){
- awayMsg = (TCHAR *) CallService(MS_AWAYMSG_GETSTATUSMSGW, (WPARAM) courAwayStatus[j], 0);
+ awayMsg = (TCHAR *) CallService(MS_AWAYMSG_GETSTATUSMSGW, (WPARAM) courAwayStatus[j], 0);
} else {
char *temp=(char *)CallService(MS_AWAYMSG_GETSTATUSMSG, (WPARAM) courAwayStatus[j], 0);
if ((int)temp == CALLSERVICE_NOTFOUND) awayMsg = 0;
@@ -228,25 +229,25 @@ static BOOL idleDialogInInit = FALSE; case 1: flags |= IDF_LONG; break;
case 2: flags |= IDF_ONFORCE; break;
}
- if ( isIdle[j]==1 && isEventFired[j] == 0 ) { // idle and no one knows
+ if ( isIdle[j]==1 && isEventFired[j] == 0 ) { // idle and no one knows
isEventFired[j]=1;
- NotifyEventHooks( hIdleEvent, 0, IDF_ISIDLE | flags );
+ NotifyEventHooks( hIdleEvent, 0, IDF_ISIDLE | flags );
}
if ( isIdle[j]==0 && isEventFired[j] == 1 ) { // not idle, no one knows
isEventFired[j]=0;
- if ( !(idleOptsPerm&IdleSuppressAutoHere) ) NotifyEventHooks( hIdleEvent, 0, flags );
+ if ( !(idleOptsPerm&IdleSuppressAutoHere) ) NotifyEventHooks( hIdleEvent, 0, flags );
}
- }//for
+ }//for
// {
// int flags = ( idleOptsPerm&IdleBitsPrivate ? IDF_PRIVACY:0 );
// if (isIdle[0]||isIdle[1]||isIdle[2]) flags |= IDF_ISIDLE;
// if (isIdle[0]) flags |= IDF_SHORT;
// if (isIdle[1]) flags |= IDF_LONG;
// if (isIdle[2]) flags |= IDF_ONFORCE;
-// NotifyEventHooks( hIdleEvent, 0, flags );
+// NotifyEventHooks( hIdleEvent, 0, flags );
// }
}
-
+
INT_PTR IdleGetInfo(WPARAM wParam, LPARAM lParam)
{
MIRANDA_IDLE_INFO * mii = (MIRANDA_IDLE_INFO *) lParam;
@@ -277,16 +278,16 @@ INT_PTR CALLBACK DlgProcOptsIdle(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l TranslateDialogDefault(hwndDlg);
InitDialogIdlePart(hwndDlg);
return TRUE;
- case WM_USER+4:
+ case WM_USER+4:
{
- DWORD nID[] = { IDC_IDLEONWINDOWS,
- IDC_IDLEUSEGLI,
- IDC_IDLEONMIRANDA,
- IDC_SCREENSAVER,
- IDC_LOCKED,
- IDC_IDLESHORT,
- IDC_IDLE1STTIME,
- IDC_IDLELONG,
+ DWORD nID[] = { IDC_IDLEONWINDOWS,
+ IDC_IDLEUSEGLI,
+ IDC_IDLEONMIRANDA,
+ IDC_SCREENSAVER,
+ IDC_LOCKED,
+ IDC_IDLESHORT,
+ IDC_IDLE1STTIME,
+ IDC_IDLELONG,
IDC_IDLE2NDTIME//,IDC_IDLEPRIVATE
};
int j;
@@ -298,7 +299,7 @@ INT_PTR CALLBACK DlgProcOptsIdle(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l case IDC_IDLE1STTIME: nEnable &= IsDlgButtonChecked(hwndDlg, IDC_IDLESHORT) == BST_CHECKED ? 1 : 0; break;
case IDC_IDLE2NDTIME: nEnable &= IsDlgButtonChecked(hwndDlg, IDC_IDLELONG) == BST_CHECKED ? 1 : 0; break;
}
- EnableWindow(GetDlgItem(hwndDlg, nID[j]), nEnable);
+ EnableWindow(GetDlgItem(hwndDlg, nID[j]), nEnable);
}
idleOpts=SetBits(idleOpts,IdleBitsCheck, IsDlgButtonChecked(hwndDlg, IDC_IDLECHECK) == BST_CHECKED);
@@ -313,7 +314,7 @@ INT_PTR CALLBACK DlgProcOptsIdle(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l idleOpts=SetBits(idleOpts,IdleSuppressIdleMenu, IsDlgButtonChecked(hwndDlg, IDC_DISABLEIDLEMENU) == BST_CHECKED);
idleOpts=SetBits(idleOpts,IdleHereOnStatusChange, IsDlgButtonChecked(hwndDlg, IDC_HEREONSTATUSCHANGE) == BST_CHECKED);
break;
- }
+ }
case WM_USER+8:
{
if (wParam == IDC_IDLE1STTIME) idleOpts = SetBits(idleOpts,IdleBitsTimeFirst,GetDlgItemInt(hwndDlg, wParam, NULL, FALSE));
@@ -322,7 +323,7 @@ INT_PTR CALLBACK DlgProcOptsIdle(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l }
case WM_COMMAND:
switch (LOWORD(wParam)) {
- case IDC_IDLEBUTTON:
+ case IDC_IDLEBUTTON:
case IDC_IDLEBUTTON+1:
case IDC_IDLEBUTTON+2:SimulateIdle(LOWORD(wParam)-IDC_IDLEBUTTON); break;
case IDC_IDLECHECK:
@@ -331,7 +332,7 @@ INT_PTR CALLBACK DlgProcOptsIdle(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l case IDC_IDLESHORT:
case IDC_IDLELONG:
case IDC_IDLEUSEGLI:
- case IDC_SCREENSAVER:
+ case IDC_SCREENSAVER:
case IDC_LOCKED:
case IDC_IDLEPRIVATE:
case IDC_DISBABLEAUTOHERE:
@@ -350,7 +351,7 @@ INT_PTR CALLBACK DlgProcOptsIdle(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l }
}
if (!idleDialogInInit) if ((HIWORD(wParam)==BN_CLICKED)||(HIWORD(wParam)==EN_CHANGE))
- {
+ {
if ((LOWORD(wParam)!=IDC_IDLEBUTTON)&&(LOWORD(wParam)!=IDC_IDLEBUTTON+1)&&(LOWORD(wParam)!=IDC_IDLEBUTTON+2))
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
}
@@ -371,4 +372,3 @@ INT_PTR CALLBACK DlgProcOptsIdle(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l }
return FALSE;
}
-
diff --git a/plugins/!NotAdopted/SmartAutoAway/idleMenu.cpp b/plugins/!NotAdopted/SmartAutoAway/idleMenu.cpp index ae03310421..70fa98a8f3 100644 --- a/plugins/!NotAdopted/SmartAutoAway/idleMenu.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/idleMenu.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2006 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-06 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/!NotAdopted/SmartAutoAway/idleMessages.cpp b/plugins/!NotAdopted/SmartAutoAway/idleMessages.cpp index 9af5eec131..9522ba9b7e 100644 --- a/plugins/!NotAdopted/SmartAutoAway/idleMessages.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/idleMessages.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2006 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-06 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -23,8 +24,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "globals.h"
-long *idleMessOptsPerm;
-long *idleMessOpts;
+long *idleMessOptsPerm;
+long *idleMessOpts;
// xxxx xxxL xxxS xxxH xxxE xxx- RSTHERE-
int *messCaps=0;
@@ -100,8 +101,8 @@ LRESULT SetDlgItemsIdleMessages(HWND hwndDlg, int coursel){ CheckDlgButton(hwndDlg, IDC_IDLEMSGHERE_THIS, (statusAvail[0] && GetBits(idleMessOpts[coursel],IdleMessOptsMaskUseHere))?BST_CHECKED:BST_UNCHECKED );
CheckDlgButton(hwndDlg, IDC_ENABLERESTOREMSG, (
- statusAvail[0] &&
- GetBits(idleMessOpts[coursel],IdleMessOptsMaskUseHere) &&
+ statusAvail[0] &&
+ GetBits(idleMessOpts[coursel],IdleMessOptsMaskUseHere) &&
GetBits(idleMessOpts[coursel],IdleMessOptsMaskRstHere))?BST_CHECKED:BST_UNCHECKED );
CheckDlgButton(hwndDlg, IDC_IDLEMSGSHORT_THIS, (statusAvail[1] && GetBits(idleMessOpts[coursel],IdleMessOptsMaskUseShort))?BST_CHECKED:BST_UNCHECKED );
CheckDlgButton(hwndDlg, IDC_IDLEMSGLONG_THIS, (statusAvail[2] && GetBits(idleMessOpts[coursel],IdleMessOptsMaskUseLong))?BST_CHECKED:BST_UNCHECKED );
@@ -138,27 +139,27 @@ INT_PTR CALLBACK DlgProcOptsIdleMessages(HWND hwndDlg, UINT msg, WPARAM wParam, return TRUE;
case WM_USER+1:
{
- EnableWindow(GetDlgItem(hwndDlg, IDC_RESTOREMSGSLIDER), wParam);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_RESTOREMSGSLIDER), wParam);
idleMessOpts[courProtocolSelection] = SetBits(idleMessOpts[courProtocolSelection],IdleMessOptsMaskRstHere,wParam);
break;
}
case WM_USER+2:
{
- EnableWindow(GetDlgItem(hwndDlg, IDC_IDLEMSGHERE), wParam);
- EnableWindow(GetDlgItem(hwndDlg, IDC_RESTOREMSGSLIDER), wParam);
- EnableWindow(GetDlgItem(hwndDlg, IDC_ENABLERESTOREMSG), wParam);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_IDLEMSGHERE), wParam);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_RESTOREMSGSLIDER), wParam);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_ENABLERESTOREMSG), wParam);
idleMessOpts[courProtocolSelection] = SetBits(idleMessOpts[courProtocolSelection],IdleMessOptsMaskUseHere,wParam);
break;
}
case WM_USER+3:
{
- EnableWindow(GetDlgItem(hwndDlg, IDC_IDLEMSGSHORT), wParam);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_IDLEMSGSHORT), wParam);
idleMessOpts[courProtocolSelection] = SetBits(idleMessOpts[courProtocolSelection],IdleMessOptsMaskUseShort,wParam);
break;
}
case WM_USER+4:
{
- EnableWindow(GetDlgItem(hwndDlg, IDC_IDLEMSGLONG), wParam);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_IDLEMSGLONG), wParam);
idleMessOpts[courProtocolSelection] = SetBits(idleMessOpts[courProtocolSelection],IdleMessOptsMaskUseLong,wParam);
break;
}
@@ -182,7 +183,7 @@ INT_PTR CALLBACK DlgProcOptsIdleMessages(HWND hwndDlg, UINT msg, WPARAM wParam, {
SendMessage(hwndDlg, WM_USER+1, (WPARAM)IsDlgButtonChecked(hwndDlg, IDC_ENABLERESTOREMSG) == BST_CHECKED, 0);
break;
- }
+ }
case IDC_IDLEMSGHERE_THIS:
{
SendMessage(hwndDlg,WM_USER+2, (WPARAM)IsDlgButtonChecked(hwndDlg, IDC_IDLEMSGHERE_THIS) == BST_CHECKED, 0);
@@ -205,7 +206,7 @@ INT_PTR CALLBACK DlgProcOptsIdleMessages(HWND hwndDlg, UINT msg, WPARAM wParam, GetDlgItemText(hwndDlg,IDC_IDLEMSGHERE,str,maxMessageLength+1);
SendMessage(hwndDlg,WM_USER+8, 0, (LPARAM)str);
} else if (HIWORD(wParam)==EN_KILLFOCUS) {
- GetDlgItemText(hwndDlg,IDC_IDLEMSGHERE,mesgHere[courProtocolSelection],maxMessageLength+1);
+ GetDlgItemText(hwndDlg,IDC_IDLEMSGHERE,mesgHere[courProtocolSelection],maxMessageLength+1);
SendMessage(hwndDlg,WM_USER+8, 0, (LPARAM)"");
}
break;
@@ -217,7 +218,7 @@ INT_PTR CALLBACK DlgProcOptsIdleMessages(HWND hwndDlg, UINT msg, WPARAM wParam, GetDlgItemText(hwndDlg,IDC_IDLEMSGSHORT,str,maxMessageLength+1);
SendMessage(hwndDlg,WM_USER+8, 0, (LPARAM)str);
} else if (HIWORD(wParam)==EN_KILLFOCUS) {
- GetDlgItemText(hwndDlg,IDC_IDLEMSGSHORT,mesgShort[courProtocolSelection],maxMessageLength+1);
+ GetDlgItemText(hwndDlg,IDC_IDLEMSGSHORT,mesgShort[courProtocolSelection],maxMessageLength+1);
SendMessage(hwndDlg,WM_USER+8, 0, (LPARAM)"");
}
break;
@@ -229,7 +230,7 @@ INT_PTR CALLBACK DlgProcOptsIdleMessages(HWND hwndDlg, UINT msg, WPARAM wParam, GetDlgItemText(hwndDlg,IDC_IDLEMSGLONG,str,maxMessageLength+1);
SendMessage(hwndDlg,WM_USER+8, 0, (LPARAM)str);
} else if (HIWORD(wParam)==EN_KILLFOCUS) {
- GetDlgItemText(hwndDlg,IDC_IDLEMSGLONG,mesgLong[courProtocolSelection],maxMessageLength+1);
+ GetDlgItemText(hwndDlg,IDC_IDLEMSGLONG,mesgLong[courProtocolSelection],maxMessageLength+1);
SendMessage(hwndDlg,WM_USER+8, 0, (LPARAM)"");
}
break;
@@ -253,7 +254,7 @@ INT_PTR CALLBACK DlgProcOptsIdleMessages(HWND hwndDlg, UINT msg, WPARAM wParam, break; //case WM_COMMAND
}
if (!idleDialogInInit) if ((HIWORD(wParam)==BN_CLICKED)||(HIWORD(wParam)==EN_CHANGE))
- {
+ {
if (LOWORD(wParam)!=IDC_VARIABLES)
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
}
diff --git a/plugins/!NotAdopted/SmartAutoAway/reconnect.cpp b/plugins/!NotAdopted/SmartAutoAway/reconnect.cpp index 6857c28e03..e8ab39432d 100644 --- a/plugins/!NotAdopted/SmartAutoAway/reconnect.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/reconnect.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2006 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-06 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -86,9 +87,9 @@ void ProtocolsProc(int protoIndex, ACKDATA * ack) }
#ifdef AALOG
-#define AALOG2
+#define AALOG2
#endif
-int IsReconnectForbidden(int protoIndex){ //0 if it permitted
+int IsReconnectForbidden(int protoIndex){ //0 if it permitted
#ifdef AALOG2
char str[256];
#endif
@@ -170,7 +171,7 @@ void TimerProc() );
CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)str);
#endif
- if ((courAwayStatus[i]==ID_STATUS_OFFLINE)||(reqStatus[i]==ID_STATUS_OFFLINE)){
+ if ((courAwayStatus[i]==ID_STATUS_OFFLINE)||(reqStatus[i]==ID_STATUS_OFFLINE)){
protoStatus[i]&=2; //keeping fatalerror if any
#ifdef AALOG
sprintf(str,"TimerProc: %s Counting Cancelled: AwayStatus: %s; reqStatus: %s;",
@@ -190,18 +191,18 @@ void TimerProc() case 4 : sprintf(str,"IsReconnectForbidden: %s fatal error and DontReconnect enabled",accounts[i]->szModuleName); break;
case 5 : sprintf(str,"IsReconnectForbidden: %s current AAStatus should not be reconnected",accounts[i]->szModuleName); break;
#endif
- case 0 :
+ case 0 :
#ifdef AALOG
sprintf(str,"IsReconnectForbidden: %s is permited to reconnect",accounts[i]->szModuleName);
#endif
CallProtoService(accounts[i]->szModuleName, PS_SETSTATUS, courAwayStatus[i], 0);
break;
- default :
+ default :
#ifdef AALOG
sprintf(str,"IsReconnectForbidden: %s Surprising answer",accounts[i]->szModuleName);
#endif
break;
- }
+ }
#ifdef AALOG1
CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)str);
#endif
@@ -252,7 +253,7 @@ INT_PTR CALLBACK DlgProcOptsReconnect(HWND hwndDlg, UINT msg, WPARAM wParam, LPA int thebit = numStatuses-StatusToProtoIndex(LOWORD(lParam),allprotomodes);
int value = IsDlgButtonChecked(hwndDlg, LOWORD(lParam)+32)==BST_CHECKED;
thebit = 1<<thebit;
- reconnectOpts[courProtocolSelection] =
+ reconnectOpts[courProtocolSelection] =
SetBits(reconnectOpts[courProtocolSelection],
thebit,
value);
@@ -277,15 +278,15 @@ INT_PTR CALLBACK DlgProcOptsReconnect(HWND hwndDlg, UINT msg, WPARAM wParam, LPA }
case WM_COMMAND:
switch (LOWORD(wParam)) {
- case ID_STATUS_AWAY+32:
+ case ID_STATUS_AWAY+32:
case ID_STATUS_DND+32:
- case ID_STATUS_NA+32:
+ case ID_STATUS_NA+32:
case ID_STATUS_OCCUPIED+32:
- case ID_STATUS_INVISIBLE+32:
- case ID_STATUS_ONTHEPHONE+32:
+ case ID_STATUS_INVISIBLE+32:
+ case ID_STATUS_ONTHEPHONE+32:
case ID_STATUS_OUTTOLUNCH+32:
case ID_STATUS_ONLINE+32:
- case ID_STATUS_FREECHAT+32:
+ case ID_STATUS_FREECHAT+32:
case ID_STATUS_OFFLINE+32:
SendMessage(hwndDlg, WM_USER+5,0,(wParam-32)|0x00100000);
break;
@@ -300,7 +301,7 @@ INT_PTR CALLBACK DlgProcOptsReconnect(HWND hwndDlg, UINT msg, WPARAM wParam, LPA break;
}
if (HIWORD(wParam)==BN_CLICKED)
- {
+ {
SendMessage(GetParent(hwndDlg), PSM_CHANGED, (unsigned int)hwndDlg, 0);
}
break;
diff --git a/plugins/!NotAdopted/SmartAutoAway/saa.cpp b/plugins/!NotAdopted/SmartAutoAway/saa.cpp index c7a7b19dd1..711cda099b 100644 --- a/plugins/!NotAdopted/SmartAutoAway/saa.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/saa.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2006 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-06 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/!NotAdopted/SmartAutoAway/saamain.cpp b/plugins/!NotAdopted/SmartAutoAway/saamain.cpp index a5eae7ee67..5792831ec9 100644 --- a/plugins/!NotAdopted/SmartAutoAway/saamain.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/saamain.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2006 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-06 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -47,7 +48,7 @@ int LoadAutoAwayModule(void) // idleTimeFirstOnPerm = db_get_b(NULL, IDLEMODULE, IDL_IDLETIME1STON, 0);
// idleTimeSecondOnPerm = db_get_b(NULL, IDLEMODULE, IDL_IDLETIME2NDON, 0);
// idleOnSaverPerm = db_get_b(NULL, IDLEMODULE, IDL_IDLEONSAVER, 0);
-// idleOnLockPerm = db_get_b(NULL, IDLEMODULE, IDL_IDLEONLOCK, 0);
+// idleOnLockPerm = db_get_b(NULL, IDLEMODULE, IDL_IDLEONLOCK, 0);
// idlePrivatePerm = db_get_b(NULL, IDLEMODULE, IDL_IDLEPRIVATE, 0);
hService[0] = CreateServiceFunction(MS_IDLE_GETIDLEINFO, IdleGetInfo);
@@ -63,7 +64,7 @@ int LoadAutoAwayModule(void) return 0;
}
-int InitVariables( WPARAM wParam, LPARAM lParam )
+int InitVariables( WPARAM wParam, LPARAM lParam )
{
int j=0;
int i=0;
@@ -81,12 +82,12 @@ int InitVariables( WPARAM wParam, LPARAM lParam ) #ifdef AALOG
{
- NETLIBUSER nlu = { 0 };
+ NETLIBUSER nlu = { 0 };
nlu.cbSize = sizeof(nlu);
nlu.szSettingsModule = "SAA";
nlu.flags=NUF_NOOPTIONS | NUF_NOHTTPSOPTION;
nlu.szDescriptiveName = Translate(SECTIONNAME " Module");
- hNetlib = (HANDLE) CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM) & nlu);
+ hNetlib = (HANDLE) CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM) & nlu);
}
{
SYSTEMTIME st={0};
@@ -231,7 +232,7 @@ int InitVariables( WPARAM wParam, LPARAM lParam ) // comb |= (1<<15);
awayStatuses[j]=comb;
db_set_w(NULL,AA_MODULE,str,(WORD)awayStatuses[j]);
- }
+ }
awayStatusesPerm[j] = awayStatuses[j];
sprintf(str,AA_LASTREQUESTEDSTATUS,accounts[j]->szModuleName); //get last requested status
@@ -250,7 +251,7 @@ int InitVariables( WPARAM wParam, LPARAM lParam ) mesgLongPerm[j]=(TCHAR *)mir_alloc(sizeof(TCHAR)*(maxMessageLength+1));
if (messCaps[j]){
- DBVARIANT dbv;
+ DBVARIANT dbv;
sprintf(str,idleMsgOptionsName,accounts[j]->szModuleName);
idleMessOptsPerm[j] = idleMessOpts[j] = db_get_dw(NULL,AA_MODULE,str,idleMsgOptionsDefault);
@@ -305,14 +306,14 @@ int InitVariables( WPARAM wParam, LPARAM lParam ) }
CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)str);
- }
+ }
#endif
//something is hapaning here on startup, if main status is not offline
//will move Notify hIdleEvent for later in the IdleTimer
// NotifyEventHooks( hIdleEvent, 0, idleOpts&IdleBitsPrivate?IDF_PRIVACY:0 ); //Tell everyone we are here
FirstTick = 1; //we will wait 1 ticks of the timer before Forcing Awake
// FirstTick = 10; //we will wait 20 seconds before Forcing Awake
- hIdleTimer=SetTimer(NULL, 0, 2000, IdleTimer);
+ hIdleTimer=SetTimer(NULL, 0, 2000, IdleTimer);
// {
// char str[20000]="";
// for (i=0;i<=101;i++){
diff --git a/plugins/!NotAdopted/SmartAutoAway/saani.cpp b/plugins/!NotAdopted/SmartAutoAway/saani.cpp index 348b21bae3..b37c49ddd9 100644 --- a/plugins/!NotAdopted/SmartAutoAway/saani.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/saani.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2006 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-06 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/!NotAdopted/mDynDNS/m_mDynDNS.h b/plugins/!NotAdopted/mDynDNS/m_mDynDNS.h index c59b38a98d..15a01b20c0 100644 --- a/plugins/!NotAdopted/mDynDNS/m_mDynDNS.h +++ b/plugins/!NotAdopted/mDynDNS/m_mDynDNS.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2004 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (ñ) 2000-04 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -40,7 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // obtain the IP
// wParam = (IPMODE) - above MDYNDNS_IPMODE flag
// lParam = (char*) - pointer (min 16 bit buffer) that recive the IP (NULL on failure)
-// returns: other than 0 on failure,
+// returns: other than 0 on failure,
#define ME_MDYNDNS_GETIP "mDynDNS/GetIP"
diff --git a/plugins/!NotAdopted/rps/rps.cpp b/plugins/!NotAdopted/rps/rps.cpp index 33d51a3c40..bbf6d794d8 100644 --- a/plugins/!NotAdopted/rps/rps.cpp +++ b/plugins/!NotAdopted/rps/rps.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2005 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-05 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-Created by Pescuma
+Created by Pescuma
Based on work by nullbie
*/
@@ -99,7 +100,7 @@ __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) // Are we running under Unicode Windows version ?
if ((GetVersion() & 0x80000000) == 0)
pluginInfo.flags = 1; // UNICODE_AWARE
-
+
pluginInfo.cbSize = sizeof(PLUGININFOEX);
return &pluginInfo;
}
@@ -403,7 +404,7 @@ void RemoveSettings() value = strchr(name, '=');
if (value == NULL)
value = &name[strlen(name)];
-
+
// Has " ?
if (*name == '"' && *(value-1) == '"')
{
@@ -436,7 +437,7 @@ void ExecuteServices() value = strchr(name, '=');
if (value == NULL)
value = &name[strlen(name)];
-
+
// Has " ?
if (*name == '"' && *(value-1) == '"')
{
@@ -495,7 +496,7 @@ void RemoveDirectories() value = strchr(name, '=');
if (value == NULL)
value = &name[strlen(name)];
-
+
// Has " ?
if (*name == '"' && *(value-1) == '"')
{
@@ -531,7 +532,7 @@ void DisablePlugins() value = strchr(name, '=');
if (value == NULL)
value = &name[strlen(name)];
-
+
// Has " ?
if (*name == '"' && *(value-1) == '"')
{
@@ -614,7 +615,7 @@ void DeleteFileOrFolder(const char *name) strTmp = &tmp[strlen(tmp)];
}
- do
+ do
{
if (strcmp(findData.cFileName, ".") && strcmp(findData.cFileName, ".."))
{
@@ -640,7 +641,7 @@ void DeleteFileOrFolder(const char *name) hwnd = FindFirstFile(tmp, &findData);
if (hwnd != INVALID_HANDLE_VALUE)
{
- do
+ do
{
if (strcmp(findData.cFileName, ".") && strcmp(findData.cFileName, ".."))
{
@@ -656,7 +657,7 @@ void DeleteFileOrFolder(const char *name) // Delete directory
RemoveDirectory(name);
}
- else // Is a File
+ else // Is a File
{
SetFileAttributes(name, FILE_ATTRIBUTE_ARCHIVE);
DeleteFile(name);
@@ -677,7 +678,7 @@ BOOL isMetaContact(HANDLE hContact) dbcgs.szModule="Protocol";
dbcgs.szSetting="p";
- if(CallService(MS_DB_CONTACT_GETSETTINGSTATIC,(WPARAM)hContact,(LPARAM)&dbcgs))
+ if(CallService(MS_DB_CONTACT_GETSETTINGSTATIC,(WPARAM)hContact,(LPARAM)&dbcgs))
return FALSE;
return strcmp(dbcgs.pValue->pszVal, METACONTACTS_PROTOCOL_NAME) == 0;
@@ -818,4 +819,3 @@ void DeleteSetting(const char *setting) free(szModule);
}
-
diff --git a/plugins/AVS/src/acc.cpp b/plugins/AVS/src/acc.cpp index a0d63c6b81..cfdfd8ec4b 100644 --- a/plugins/AVS/src/acc.cpp +++ b/plugins/AVS/src/acc.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2004 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-04 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -31,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define GIF_DISPOSAL_BACKGROUND 2
#define GIF_DISPOSAL_PREVIOUS 3
-typedef struct
+typedef struct
{
HANDLE hContact;
char proto[64];
@@ -90,7 +91,7 @@ void ResizeFlash(HWND hwnd, ACCData* data) rc.bottom -= 2;
}
- FLASHAVATAR fa = {0};
+ FLASHAVATAR fa = {0};
fa.hContact = data->hContact;
fa.cProto = data->proto;
fa.hParentWindow = hwnd;
@@ -105,7 +106,7 @@ void SetBkgFlash(HWND hwnd, ACCData* data) if ((data->hContact != NULL || data->proto[0] != '\0')
&& ServiceExists(MS_FAVATAR_SETBKCOLOR))
{
- FLASHAVATAR fa = {0};
+ FLASHAVATAR fa = {0};
fa.hContact = data->hContact;
fa.cProto = data->proto;
fa.hParentWindow = hwnd;
@@ -125,7 +126,7 @@ void DestroyFlash(HWND hwnd, ACCData* data) if ((data->hContact != NULL || data->proto[0] != '\0') && ServiceExists(MS_FAVATAR_DESTROY))
{
- FLASHAVATAR fa = {0};
+ FLASHAVATAR fa = {0};
fa.hContact = data->hContact;
fa.cProto = data->proto;
fa.hParentWindow = hwnd;
@@ -149,7 +150,7 @@ void StartFlash(HWND hwnd, ACCData* data) else if (data->proto[0] != '\0')
{
protoPicCacheEntry *ace = NULL;
- for (int i = 0; i < g_MyAvatars.getCount(); i++)
+ for (int i = 0; i < g_MyAvatars.getCount(); i++)
{
if (!lstrcmpA(data->proto, g_MyAvatars[i].szProtoname))
{
@@ -160,7 +161,7 @@ void StartFlash(HWND hwnd, ACCData* data) if (ace != NULL && ace->szFilename != NULL)
format = ProtoGetAvatarFormat(ace->szFilename);
- else
+ else
format = 0;
}
else
@@ -169,14 +170,14 @@ void StartFlash(HWND hwnd, ACCData* data) if (format != PA_FORMAT_XML && format != PA_FORMAT_SWF)
return;
- FLASHAVATAR fa = {0};
+ FLASHAVATAR fa = {0};
fa.hContact = data->hContact;
fa.cProto = data->proto;
fa.hParentWindow = hwnd;
fa.id = 1675;
CallService(MS_FAVATAR_MAKE, (WPARAM)&fa, 0);
- if (fa.hWindow == NULL)
+ if (fa.hWindow == NULL)
return;
data->showingFlash = TRUE;
@@ -189,21 +190,21 @@ BOOL AnimatedGifGetData(ACCData* data) FIBITMAP *page = fei->FI_LockPage(data->ag.multi, 0);
if (page == NULL)
return FALSE;
-
+
// Get info
FITAG *tag = NULL;
if (!fei->FI_GetMetadata(FIMD_ANIMATION, page, "LogicalWidth", &tag))
goto ERR;
data->ag.logicalWidth = *(WORD *)fei->FI_GetTagValue(tag);
-
+
if (!fei->FI_GetMetadata(FIMD_ANIMATION, page, "LogicalHeight", &tag))
goto ERR;
data->ag.logicalHeight = *(WORD *)fei->FI_GetTagValue(tag);
-
+
if (!fei->FI_GetMetadata(FIMD_ANIMATION, page, "Loop", &tag))
goto ERR;
data->ag.loop = (*(LONG *)fei->FI_GetTagValue(tag) > 0);
-
+
if (fei->FI_HasBackgroundColor(page))
fei->FI_GetBackgroundColor(page, &data->ag.background);
@@ -217,15 +218,15 @@ ERR: void AnimatedGifDispodeFrame(ACCData* data)
{
- if (data->ag.frame.disposal_method == GIF_DISPOSAL_PREVIOUS)
+ if (data->ag.frame.disposal_method == GIF_DISPOSAL_PREVIOUS)
{
// TODO
- }
- else if (data->ag.frame.disposal_method == GIF_DISPOSAL_BACKGROUND)
+ }
+ else if (data->ag.frame.disposal_method == GIF_DISPOSAL_BACKGROUND)
{
- for (int y = 0; y < data->ag.frame.height; y++)
+ for (int y = 0; y < data->ag.frame.height; y++)
{
- RGBQUAD *scanline = (RGBQUAD *) fei->FI_GetScanLine(data->ag.dib,
+ RGBQUAD *scanline = (RGBQUAD *) fei->FI_GetScanLine(data->ag.dib,
data->ag.logicalHeight - (y + data->ag.frame.top) - 1) + data->ag.frame.left;
for (int x = 0; x < data->ag.frame.width; x++)
*scanline++ = data->ag.background;
@@ -358,7 +359,7 @@ void StartAnimatedGif(HWND hwnd, ACCData* data) AVATARCACHEENTRY *ace = NULL;
if (data->hContact != NULL)
- ace = (AVATARCACHEENTRY *) GetAvatarBitmap((WPARAM) data->hContact, 0);
+ ace = (AVATARCACHEENTRY *) GetAvatarBitmap((WPARAM) data->hContact, 0);
else
ace = (AVATARCACHEENTRY *) GetMyAvatar(0, (LPARAM) data->proto);
@@ -390,7 +391,7 @@ void StartAnimatedGif(HWND hwnd, ACCData* data) goto ERR;
//fill with background color to start
- for (y = 0; y < data->ag.logicalHeight; y++)
+ for (y = 0; y < data->ag.logicalHeight; y++)
{
RGBQUAD *scanline = (RGBQUAD *) fei->FI_GetScanLine(data->ag.dib, y);
for (x = 0; x < data->ag.logicalWidth; x++)
@@ -463,7 +464,7 @@ static void Invalidate(HWND hwnd) HWND parent = GetParent(hwnd);
RECT rc;
GetWindowRect(hwnd, &rc);
- ScreenToClient(parent, &rc);
+ ScreenToClient(parent, &rc);
InvalidateRect(parent, &rc, TRUE);
}
InvalidateRect(hwnd, NULL, TRUE);
@@ -492,13 +493,13 @@ static void DrawText(HDC hdc, HFONT hFont, const RECT &rc, const TCHAR *text) // Calc text size
RECT tr_ret = tr;
- DrawText(hdc, text, -1, &tr_ret,
+ DrawText(hdc, text, -1, &tr_ret,
DT_WORDBREAK | DT_NOPREFIX | DT_CENTER | DT_CALCRECT);
// Calc needed size
tr.top += ((tr.bottom - tr.top) - (tr_ret.bottom - tr_ret.top)) / 2;
tr.bottom = tr.top + (tr_ret.bottom - tr_ret.top);
- DrawText(hdc, text, -1, &tr,
+ DrawText(hdc, text, -1, &tr,
DT_WORDBREAK | DT_NOPREFIX | DT_CENTER);
SelectObject(hdc, oldFont);
@@ -506,7 +507,7 @@ static void DrawText(HDC hdc, HFONT hFont, const RECT &rc, const TCHAR *text) static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
ACCData* data = (ACCData *) GetWindowLongPtr(hwnd, 0);
- switch(msg)
+ switch(msg)
{
case WM_NCCREATE:
{
@@ -514,7 +515,7 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l SetWindowLongPtr(hwnd, GWL_EXSTYLE, GetWindowLongPtr(hwnd, GWL_EXSTYLE) | WS_EX_TRANSPARENT);
data = (ACCData*) mir_alloc(sizeof(ACCData));
- if (data == NULL)
+ if (data == NULL)
return FALSE;
SetWindowLongPtr(hwnd, 0, (LONG_PTR)data);
@@ -536,7 +537,7 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l case WM_NCDESTROY:
{
DestroyAnimation(hwnd, data);
- if (data)
+ if (data)
{
UnhookEvent(data->hHook);
UnhookEvent(data->hHookMy);
@@ -653,7 +654,7 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l // Get avatar
if (data->showingFlash && ServiceExists(MS_FAVATAR_GETINFO))
{
- FLASHAVATAR fa = {0};
+ FLASHAVATAR fa = {0};
fa.hContact = data->hContact;
fa.cProto = data->proto;
fa.hParentWindow = hwnd;
@@ -673,7 +674,7 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l else
ace = (avatarCacheEntry *) CallService(MS_AV_GETAVATARBITMAP, (WPARAM) data->hContact, 0);
- if (ace == NULL || ace->bmHeight == 0 || ace->bmWidth == 0
+ if (ace == NULL || ace->bmHeight == 0 || ace->bmWidth == 0
|| (data->respectHidden && (ace->dwFlags & AVS_HIDEONCLIST)))
{
*width = 0;
@@ -689,14 +690,14 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l {
*height = ace->bmHeight;
*width = ace->bmWidth;
- }
+ }
else if (ace->bmHeight > ace->bmWidth)
{
float dScale = targetHeight / (float)ace->bmHeight;
*height = targetHeight;
*width = (int) (ace->bmWidth * dScale);
}
- else
+ else
{
float dScale = targetWidth / (float)ace->bmWidth;
*height = (int) (ace->bmHeight * dScale);
@@ -734,7 +735,7 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l {
PAINTSTRUCT ps;
HDC hdc = BeginPaint(hwnd, &ps);
- if (hdc == NULL)
+ if (hdc == NULL)
break;
int oldBkMode = SetBkMode(hdc, TRANSPARENT);
@@ -783,7 +784,7 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l avdrq.szProto = data->proto;
avdrq.hTargetDC = hdc;
avdrq.dwFlags = AVDRQ_HIDEBORDERONTRANSPARENCY
- | (data->respectHidden ? AVDRQ_RESPECTHIDDEN : 0)
+ | (data->respectHidden ? AVDRQ_RESPECTHIDDEN : 0)
| (data->hContact != NULL ? 0 : AVDRQ_OWNPIC)
| (data->avatarBorderColor == -1 ? 0 : AVDRQ_DRAWBORDER)
| (data->avatarRoundCornerRadius <= 0 ? 0 : AVDRQ_ROUNDEDCORNER)
@@ -806,8 +807,8 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l }
else
ret = DrawAvatarPicture(0, (LPARAM)&avdrq);
-
- if (ret == 0)
+
+ if (ret == 0)
DrawText(hdc, data->hFont, rc, data->noAvatarText);
}
@@ -885,7 +886,7 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l }
-int LoadACC()
+int LoadACC()
{
WNDCLASSEX wc = {0};
wc.cbSize = sizeof(wc);
diff --git a/plugins/AVS/src/commonheaders.h b/plugins/AVS/src/commonheaders.h index 063a5ece20..c5f91779c2 100644 --- a/plugins/AVS/src/commonheaders.h +++ b/plugins/AVS/src/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2004 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-04 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -68,7 +69,7 @@ struct CacheNode {
CacheNode *pNextNode;
avatarCacheEntry ace;
-
+
BOOL loaded;
int mustLoad;
DWORD dwFlags;
diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp index 465edd4587..5c4c050b3f 100644 --- a/plugins/AVS/src/main.cpp +++ b/plugins/AVS/src/main.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2004 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-04 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp index b4907b8efa..fa15d767a3 100644 --- a/plugins/AVS/src/options.cpp +++ b/plugins/AVS/src/options.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2004 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-04 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/AVS/src/services.cpp b/plugins/AVS/src/services.cpp index 7eb7c654ea..8866404681 100644 --- a/plugins/AVS/src/services.cpp +++ b/plugins/AVS/src/services.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2004 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-04 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -976,7 +977,7 @@ void InitServices() CreateServiceFunction(MS_AV_DRAWAVATAR, DrawAvatarPicture);
CreateServiceFunction(MS_AV_GETMYAVATAR, GetMyAvatar);
CreateServiceFunction(MS_AV_REPORTMYAVATARCHANGED, ReportMyAvatarChanged);
-
+
CreateServiceFunction(MS_AV_LOADBITMAP32, BmpFilterLoadBitmap32);
CreateServiceFunction(MS_AV_SAVEBITMAP, BmpFilterSaveBitmap);
CreateServiceFunction(MS_AV_CANSAVEBITMAP, BmpFilterCanSaveBitmap);
diff --git a/plugins/AVS/src/stdafx.cpp b/plugins/AVS/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/AVS/src/stdafx.cpp +++ b/plugins/AVS/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/AddContactPlus/src/Version.h b/plugins/AddContactPlus/src/Version.h index a98807d3df..7a1e877f06 100644 --- a/plugins/AddContactPlus/src/Version.h +++ b/plugins/AddContactPlus/src/Version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Bartosz 'Dezeath' Bialek"
#define __AUTHOREMAIL "dezred@gmail.com"
#define __AUTHORWEB "http://miranda-ng.org/p/AddContactPlus/"
-#define __COPYRIGHT "© 2007-2013 Bartosz 'Dezeath' Bialek, Miranda NG Team"
+#define __COPYRIGHT "© 2007-14 Bartosz 'Dezeath' Bialek, Miranda NG Team"
diff --git a/plugins/AddContactPlus/src/addcontact.cpp b/plugins/AddContactPlus/src/addcontact.cpp index cbbdeb538e..fef74b9265 100644 --- a/plugins/AddContactPlus/src/addcontact.cpp +++ b/plugins/AddContactPlus/src/addcontact.cpp @@ -1,8 +1,8 @@ /*
AddContact+ plugin for Miranda NG
-Copyright (C) 2007-2011 Bartosz 'Dezeath' Bia³ek
-Copyright (C) 2012-2013 Miranda NG Team
+Copyright (C) 2007-11 Bartosz 'Dezeath' Bia³ek
+Copyright (C) 2012-14 Miranda NG Team
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/AddContactPlus/src/addcontactplus.h b/plugins/AddContactPlus/src/addcontactplus.h index b404c4cbe2..3d8cef9bf2 100644 --- a/plugins/AddContactPlus/src/addcontactplus.h +++ b/plugins/AddContactPlus/src/addcontactplus.h @@ -1,8 +1,8 @@ /*
AddContact+ plugin for Miranda NG
-Copyright (C) 2007-2011 Bartosz 'Dezeath' Bia³ek
-Copyright (C) 2012-2013 Miranda NG Team
+Copyright (C) 2007-11 Bartosz 'Dezeath' Bia³ek
+Copyright (C) 2012-14 Miranda NG Team
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/plugins/AddContactPlus/src/main.cpp b/plugins/AddContactPlus/src/main.cpp index 785840056f..352950417a 100644 --- a/plugins/AddContactPlus/src/main.cpp +++ b/plugins/AddContactPlus/src/main.cpp @@ -1,8 +1,8 @@ /*
AddContact+ plugin for Miranda NG
-Copyright (C) 2007-2011 Bartosz 'Dezeath' Bia³ek
-Copyright (C) 2012-2013 Miranda NG Team
+Copyright (C) 2007-11 Bartosz 'Dezeath' Bia³ek
+Copyright (C) 2012-14 Miranda NG Team
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) static INT_PTR AddContactPlusDialog(WPARAM, LPARAM)
{
if(hAddDlg) {
- SetForegroundWindow(hAddDlg);
+ SetForegroundWindow(hAddDlg);
SetFocus(hAddDlg);
}
else hAddDlg = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_ADDCONTACT), NULL, AddContactDlgProc, 0);
@@ -133,7 +133,7 @@ static int OnModulesLoaded(WPARAM, LPARAM) Hotkey_Register(&hkd);
OnAccListChanged(0, 0);
-
+
HookEvent(ME_TTB_MODULELOADED, CreateButton);
return 0;
}
@@ -150,7 +150,7 @@ extern "C" int __declspec(dllexport) Load(void) HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
HookEvent(ME_PROTO_ACCLISTCHANGED, OnAccListChanged);
-
+
CreateServiceFunction(MS_ADDCONTACTPLUS_SHOW, AddContactPlusDialog);
return 0;
}
diff --git a/plugins/AddContactPlus/src/stdafx.cpp b/plugins/AddContactPlus/src/stdafx.cpp index 6c4c013efa..ae92038fec 100644 --- a/plugins/AddContactPlus/src/stdafx.cpp +++ b/plugins/AddContactPlus/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/AdvaImg/src/version.h b/plugins/AdvaImg/src/version.h index 430bda886b..5d11e943bb 100644 --- a/plugins/AdvaImg/src/version.h +++ b/plugins/AdvaImg/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Nightwish, The FreeImage project (http://freeimage.sourceforge.net/)"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "http://miranda-ng.org/p/AdvaImg/"
-#define __COPYRIGHT "© 2000-2012 Miranda-IM project, 2012-2013 Miranda NG project uses the FreeImage distribution"
+#define __COPYRIGHT "© 2000-2012 Miranda-IM project, 2012-14 Miranda NG project uses the FreeImage distribution"
diff --git a/plugins/Alarms/src/stdafx.cpp b/plugins/Alarms/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/Alarms/src/stdafx.cpp +++ b/plugins/Alarms/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/AssocMgr/src/stdafx.cpp b/plugins/AssocMgr/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/AssocMgr/src/stdafx.cpp +++ b/plugins/AssocMgr/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/AuthState/src/stdafx.cpp b/plugins/AuthState/src/stdafx.cpp index 872a8840fa..78db5183fb 100644 --- a/plugins/AuthState/src/stdafx.cpp +++ b/plugins/AuthState/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/AutoRun/src/stdafx.cpp b/plugins/AutoRun/src/stdafx.cpp index 1ddfafbbbd..88ac2c2369 100644 --- a/plugins/AutoRun/src/stdafx.cpp +++ b/plugins/AutoRun/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/AutoShutdown/src/stdafx.cpp b/plugins/AutoShutdown/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/AutoShutdown/src/stdafx.cpp +++ b/plugins/AutoShutdown/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/AvatarHistory/src/stdafx.cpp b/plugins/AvatarHistory/src/stdafx.cpp index 15e91f37a2..2603344e2f 100644 --- a/plugins/AvatarHistory/src/stdafx.cpp +++ b/plugins/AvatarHistory/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/BASS_interface/src/stdafx.cpp b/plugins/BASS_interface/src/stdafx.cpp index dda881ef8e..cea5e6ee92 100644 --- a/plugins/BASS_interface/src/stdafx.cpp +++ b/plugins/BASS_interface/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Boltun/src/stdafx.cpp b/plugins/Boltun/src/stdafx.cpp index acd7a27bd5..1b882254dc 100644 --- a/plugins/Boltun/src/stdafx.cpp +++ b/plugins/Boltun/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/BossKeyPlus/src/BossKeyIdle.cpp b/plugins/BossKeyPlus/src/BossKeyIdle.cpp index 65e090de21..bec29756f4 100644 --- a/plugins/BossKeyPlus/src/BossKeyIdle.cpp +++ b/plugins/BossKeyPlus/src/BossKeyIdle.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2005 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-05 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -24,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "BossKey.h"
POINT mousepos;
-UINT_PTR hTimer;
+UINT_PTR hTimer;
UINT mouseidle, minutes;
VOID CALLBACK IdleTimer(HWND hwnd, UINT umsg, UINT idEvent, DWORD dwTime);
@@ -36,9 +37,9 @@ static bool IsUserIdle() CallService(MS_SYSTEM_GETIDLE, 0, (DWORD)&dwTick);
return GetTickCount() - dwTick > (minutes * 60 * 1000);
}
-
+
LASTINPUTINFO ii = { sizeof(ii) };
- if ( GetLastInputInfo(&ii))
+ if ( GetLastInputInfo(&ii))
return GetTickCount() - ii.dwTime > (minutes * 60 * 1000);
return FALSE;
@@ -46,7 +47,7 @@ static bool IsUserIdle() VOID CALLBACK IdleTimer(HWND hwnd, UINT umsg, UINT_PTR idEvent, DWORD dwTime)
{
- if ( hTimer == idEvent && !g_bWindowHidden && ((g_wMaskAdv & (OPT_HIDEIFWINIDLE | OPT_HIDEIFMIRIDLE) && IsUserIdle()) ||
+ if ( hTimer == idEvent && !g_bWindowHidden && ((g_wMaskAdv & (OPT_HIDEIFWINIDLE | OPT_HIDEIFMIRIDLE) && IsUserIdle()) ||
(g_wMaskAdv & OPT_HIDEIFSCRSVR) && IsScreenSaverRunning()))
BossKeyHideMiranda(0, 0);
}
diff --git a/plugins/BossKeyPlus/src/stdafx.cpp b/plugins/BossKeyPlus/src/stdafx.cpp index 9e866d16db..4f5fc406d2 100644 --- a/plugins/BossKeyPlus/src/stdafx.cpp +++ b/plugins/BossKeyPlus/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/BuddyExpectator/src/stdafx.cpp b/plugins/BuddyExpectator/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/BuddyExpectator/src/stdafx.cpp +++ b/plugins/BuddyExpectator/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/BuddyPounce/src/stdafx.cpp b/plugins/BuddyPounce/src/stdafx.cpp index 48d92d3d56..5304ea985c 100644 --- a/plugins/BuddyPounce/src/stdafx.cpp +++ b/plugins/BuddyPounce/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CSList/src/stdafx.cpp b/plugins/CSList/src/stdafx.cpp index a2d91a6a7f..dec155d806 100644 --- a/plugins/CSList/src/stdafx.cpp +++ b/plugins/CSList/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/ChangeKeyboardLayout/src/stdafx.cpp b/plugins/ChangeKeyboardLayout/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/ChangeKeyboardLayout/src/stdafx.cpp +++ b/plugins/ChangeKeyboardLayout/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/ClientChangeNotify/src/stdafx.cpp b/plugins/ClientChangeNotify/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/ClientChangeNotify/src/stdafx.cpp +++ b/plugins/ClientChangeNotify/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Clist_blind/src/Version.h b/plugins/Clist_blind/src/Version.h index 2167bdcf45..fb66043517 100644 --- a/plugins/Clist_blind/src/Version.h +++ b/plugins/Clist_blind/src/Version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Ricardo Pescuma Domenecci, based on previous work from Miranda IM project"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "http://miranda-ng.org/p/Clist_blind/"
-#define __COPYRIGHT "Copyright 2000-2009 Miranda IM project, Ricardo Pescuma Domenecci, 2013 Miranda NG project, George Hazan"
+#define __COPYRIGHT "Copyright 2000-2009 Miranda IM project, Ricardo Pescuma Domenecci, 2013-14 Miranda NG project"
diff --git a/plugins/Clist_blind/src/clc.h b/plugins/Clist_blind/src/clc.h index 3a8328e0af..db590ec63d 100644 --- a/plugins/Clist_blind/src/clc.h +++ b/plugins/Clist_blind/src/clc.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_blind/src/clcopts.cpp b/plugins/Clist_blind/src/clcopts.cpp index f81e31abe0..0aeba193a2 100644 --- a/plugins/Clist_blind/src/clcopts.cpp +++ b/plugins/Clist_blind/src/clcopts.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
diff --git a/plugins/Clist_blind/src/clcpaint.cpp b/plugins/Clist_blind/src/clcpaint.cpp index f9d2094c61..ba2d069264 100644 --- a/plugins/Clist_blind/src/clcpaint.cpp +++ b/plugins/Clist_blind/src/clcpaint.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
diff --git a/plugins/Clist_blind/src/clistmenus.cpp b/plugins/Clist_blind/src/clistmenus.cpp index 280e794363..bb5495bfd8 100644 --- a/plugins/Clist_blind/src/clistmenus.cpp +++ b/plugins/Clist_blind/src/clistmenus.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_blind/src/clistopts.cpp b/plugins/Clist_blind/src/clistopts.cpp index c0e88f04a2..a8e5220189 100644 --- a/plugins/Clist_blind/src/clistopts.cpp +++ b/plugins/Clist_blind/src/clistopts.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -139,7 +140,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP }
if (-1 == (int) SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0))
SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETCURSEL, 0, 0);
- SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETBUDDY, (WPARAM) GetDlgItem(hwndDlg, IDC_BLINKTIME), 0); // set buddy
+ SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETBUDDY, (WPARAM) GetDlgItem(hwndDlg, IDC_BLINKTIME), 0); // set buddy
SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETRANGE, 0, MAKELONG(0x3FFF, 250));
SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(NULL, "CList", "IconFlashTime", 550), 0));
return TRUE;
@@ -214,7 +215,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP PROTOACCOUNT* pa = ( PROTOACCOUNT* )SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cur, 0 );
if ( pa == NULL )
db_unset(NULL, "CList", "PrimaryStatus");
- else
+ else
db_set_s(NULL, "CList", "PrimaryStatus", pa->szModuleName );
}
diff --git a/plugins/Clist_blind/src/cluiopts.cpp b/plugins/Clist_blind/src/cluiopts.cpp index 5ba32173d9..64f53a1f57 100644 --- a/plugins/Clist_blind/src/cluiopts.cpp +++ b/plugins/Clist_blind/src/cluiopts.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -299,8 +300,8 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L /****************************************************************************************/
static UINT expertOnlyControls[] =
-{
- IDC_BRINGTOFRONT, IDC_AUTOSIZE, IDC_STATIC21, IDC_MAXSIZEHEIGHT, IDC_MAXSIZESPIN,
+{
+ IDC_BRINGTOFRONT, IDC_AUTOSIZE, IDC_STATIC21, IDC_MAXSIZEHEIGHT, IDC_MAXSIZESPIN,
IDC_STATIC22, IDC_AUTOSIZEUPWARD, IDC_SHOWMAINMENU, IDC_SHOWCAPTION, IDC_CLIENTDRAG
};
diff --git a/plugins/Clist_blind/src/commonheaders.h b/plugins/Clist_blind/src/commonheaders.h index d95d9ffa80..45df80cf73 100644 --- a/plugins/Clist_blind/src/commonheaders.h +++ b/plugins/Clist_blind/src/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2005 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-05 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_blind/src/init.cpp b/plugins/Clist_blind/src/init.cpp index 7e32786bcf..90872edde0 100644 --- a/plugins/Clist_blind/src/init.cpp +++ b/plugins/Clist_blind/src/init.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2005 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org)
+Copyright (c) 2000-05 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp index ff48ca4304..da132602d1 100644 --- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -606,8 +608,8 @@ static void PositionThumb( FRAMEWND *pThumb, short nX, short nY ) HWND_TOPMOST,
nNewX,
nNewY,
- 0,
- 0,
+ 0,
+ 0,
SWP_NOSIZE | SWP_NOZORDER|SWP_NOACTIVATE );
@@ -1858,7 +1860,7 @@ static int _us_DoAddFrame(WPARAM wParam,LPARAM lParam) pcli->hwndContactList, NULL, g_hInst,
NULL);
- SetWindowPos(g_pfwFrames[g_nFramesCount].TitleBar.hwndTip, HWND_TOPMOST, 0, 0, 0, 0,
+ SetWindowPos(g_pfwFrames[g_nFramesCount].TitleBar.hwndTip, HWND_TOPMOST, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
{
TOOLINFOA ti;
@@ -1877,7 +1879,7 @@ static int _us_DoAddFrame(WPARAM wParam,LPARAM lParam) g_pfwFrames[g_nFramesCount].oldstyles = GetWindowLongPtr(g_pfwFrames[g_nFramesCount].hWnd,GWL_STYLE);
g_pfwFrames[g_nFramesCount].TitleBar.oldstyles = GetWindowLongPtr(g_pfwFrames[g_nFramesCount].TitleBar.hwnd,GWL_STYLE);
- //Frames[nFramescount].FloatingPos.x =
+ //Frames[nFramescount].FloatingPos.x =
retval = g_pfwFrames[g_nFramesCount].id;
g_pfwFrames[g_nFramesCount].order = g_nFramesCount+1;
@@ -2048,9 +2050,9 @@ static int CLUIFrameMoveResize(const FRAMEWND *Frame) {
SetWindowPos(Frame->OwnerWindow,NULL,Frame->wndSize.left+Off.x,Frame->wndSize.top+Off.y,
Frame->wndSize.right-Frame->wndSize.left,
- Frame->wndSize.bottom-Frame->wndSize.top,SWP_NOZORDER|SWP_NOACTIVATE ); //- -= -=
+ Frame->wndSize.bottom-Frame->wndSize.top,SWP_NOZORDER|SWP_NOACTIVATE ); //- -= -=
- SetWindowPos(Frame->hWnd,NULL, 0, 0,
+ SetWindowPos(Frame->hWnd,NULL, 0, 0,
Frame->wndSize.right-Frame->wndSize.left,
Frame->wndSize.bottom-Frame->wndSize.top,SWP_NOZORDER|SWP_NOACTIVATE);
}
@@ -2348,8 +2350,8 @@ int CLUIFrames_ApplyNewSizes(int mode) int i;
g_CluiData.mutexPreventDockMoving = 0;
for (i=0; i < g_nFramesCount; i++) {
- if ((mode == 1 && g_pfwFrames[i].OwnerWindow != (HWND)-2 && g_pfwFrames[i].OwnerWindow) ||
- (mode == 2 && g_pfwFrames[i].OwnerWindow == (HWND)-2) ||
+ if ((mode == 1 && g_pfwFrames[i].OwnerWindow != (HWND)-2 && g_pfwFrames[i].OwnerWindow) ||
+ (mode == 2 && g_pfwFrames[i].OwnerWindow == (HWND)-2) ||
(mode == 3))
if (g_pfwFrames[i].floating){
CLUIFrameResizeFloatingFrame(i);
@@ -2448,7 +2450,7 @@ int SizeFramesByWindowRect(RECT *r, HDWP * PosBatch, int mode) hwnd = GetParent(g_pfwFrames[i].OwnerWindow);
*PosBatch = DeferWindowPos(*PosBatch,g_pfwFrames[i].OwnerWindow,NULL,g_pfwFrames[i].wndSize.left+r->left,g_pfwFrames[i].wndSize.top+r->top,
g_pfwFrames[i].wndSize.right-g_pfwFrames[i].wndSize.left, g_pfwFrames[i].wndSize.bottom-g_pfwFrames[i].wndSize.top,SWP_NOZORDER|SWP_NOACTIVATE);
- SetWindowPos(g_pfwFrames[i].hWnd,NULL, 0, 0,
+ SetWindowPos(g_pfwFrames[i].hWnd,NULL, 0, 0,
g_pfwFrames[i].wndSize.right-g_pfwFrames[i].wndSize.left, g_pfwFrames[i].wndSize.bottom-g_pfwFrames[i].wndSize.top,SWP_NOZORDER|SWP_NOACTIVATE/*|SWP_NOSENDCHANGING*/);
}
//Frame
@@ -3251,8 +3253,8 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam HWND_TOPMOST,
nLeft,
nTop,
- 0,
- 0,
+ 0,
+ 0,
SWP_NOSIZE |SWP_NOACTIVATE| SWP_NOZORDER );
ptOld = ptNew;
diff --git a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp index 0b47bc71da..f6974a6eb1 100644 --- a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp +++ b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -72,7 +73,7 @@ INT_PTR BuildGroupMenu(WPARAM wParam,LPARAM lParam) HMENU hMenu = CreatePopupMenu();
//hMenu = wParam;
int tick = GetTickCount();
-
+
NotifyEventHooks(g_CluiData.hEventPreBuildGroupMenu, 0, 0);
CallService(MO_BUILDMENU,(WPARAM)hMenu,(LPARAM)¶m);
@@ -91,7 +92,7 @@ static INT_PTR AddGroupMenuItem(WPARAM wParam,LPARAM lParam) lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)mir_calloc(sizeof(GroupMenuExecParam));
if (mmep == NULL)
return 0;
-
+
//we need just one parametr.
mmep->szServiceName = mir_strdup(mi->pszService);
mmep->Param1 = mi->popupPosition;
@@ -107,7 +108,7 @@ static INT_PTR AddGroupMenuItem(WPARAM wParam,LPARAM lParam) OptParam op;
op.Handle = (HANDLE)CallService(MO_ADDNEWMENUITEM,(WPARAM)hGroupMenuObject,(LPARAM)&tmi);
- op.Setting = OPT_MENUITEMSETUNIQNAME;
+ op.Setting = OPT_MENUITEMSETUNIQNAME;
op.Value = (INT_PTR)buf;
CallService(MO_SETOPTIONSMENUITEM, 0, (LPARAM)&op);
return (INT_PTR)op.Handle;
@@ -131,12 +132,12 @@ INT_PTR GroupMenuonAddService(WPARAM wParam,LPARAM lParam) { }
if (hGroupMainMenuItemProxy == (HANDLE)lParam) {
mii->fMask |= MIIM_SUBMENU;
- mii->hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETMAIN, 0, 0);
+ mii->hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETMAIN, 0, 0);
}
if (hGroupStatusMenuItemProxy == (HANDLE)lParam) {
mii->fMask |= MIIM_SUBMENU;
- mii->hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETSTATUS, 0, 0);
+ mii->hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETSTATUS, 0, 0);
}
return TRUE;
@@ -148,13 +149,13 @@ INT_PTR GroupMenuonAddService(WPARAM wParam,LPARAM lParam) { INT_PTR GroupMenuExecService(WPARAM wParam,LPARAM lParam)
{
if (wParam != 0) {
- lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)wParam;
+ lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)wParam;
if ( !mir_strcmp(mmep->szServiceName,"Help/AboutCommand")) {
//bug in help.c,it used wparam as parent window handle without reason.
mmep->Param1 = 0;
- CallService(mmep->szServiceName,mmep->Param1,lParam);
+ CallService(mmep->szServiceName,mmep->Param1,lParam);
}
- else CallService(mmep->szServiceName,mmep->Param1,mmep->Param2);
+ else CallService(mmep->szServiceName,mmep->Param1,mmep->Param2);
}
return 1;
}
@@ -179,7 +180,7 @@ INT_PTR HideGroupsHelper(WPARAM wParam,LPARAM lParam) }
INT_PTR UseGroupsHelper(WPARAM wParam,LPARAM lParam)
-{
+{
int newVal = !(GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_USEGROUPS);
db_set_b(NULL,"CList","UseGroups",(BYTE)newVal);
SendMessage(pcli->hwndContactTree,CLM_SETUSEGROUPS,newVal,0);
@@ -210,13 +211,13 @@ static int OnBuildGroupMenu(WPARAM wParam,LPARAM lParam) CLISTMENUITEM mi = { sizeof(mi) };
mi.flags = CMIM_FLAGS | ( db_get_b(NULL,"CList","HideOffline",SETTING_HIDEOFFLINE_DEFAULT)?CMIF_CHECKED:0);
- Menu_ModifyItem(hHideOfflineUsersMenuItem, &mi);
+ Menu_ModifyItem(hHideOfflineUsersMenuItem, &mi);
mi.flags = CMIM_FLAGS | (SendMessage(pcli->hwndContactTree,CLM_GETHIDEOFFLINEROOT, 0, 0)?CMIF_CHECKED:0);
- Menu_ModifyItem(hHideOfflineUsersOutHereMenuItem, &mi);
-
+ Menu_ModifyItem(hHideOfflineUsersOutHereMenuItem, &mi);
+
mi.flags = CMIM_FLAGS | (GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_HIDEEMPTYGROUPS?CMIF_CHECKED:0);
- Menu_ModifyItem(hHideEmptyGroupsMenuItem, &mi);
+ Menu_ModifyItem(hHideEmptyGroupsMenuItem, &mi);
mi.flags = CMIM_FLAGS | (GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_USEGROUPS?0:CMIF_CHECKED);
Menu_ModifyItem(hDisableGroupsMenuItem, &mi);
@@ -230,7 +231,7 @@ int static OnIconLibIconChanged(WPARAM wParam,LPARAM lParam) if (MirandaExiting()) return 0;
HICON hIcon = Skin_GetIconByHandle(iconItem.hIcolib);
- NewGroupIconidx = ImageList_ReplaceIcon(hCListImages, NewGroupIconidx, hIcon);
+ NewGroupIconidx = ImageList_ReplaceIcon(hCListImages, NewGroupIconidx, hIcon);
Skin_ReleaseIcon(hIcon);
CLISTMENUITEM clmi = { sizeof(clmi) };
@@ -246,7 +247,7 @@ void GroupMenus_Init(void) Icon_Register(g_hInst, "Contact List", &iconItem, 1);
HICON hIcon = Skin_GetIconByHandle(iconItem.hIcolib);
- NewGroupIconidx = hIcon ? ImageList_AddIcon(hCListImages, hIcon) : -1;
+ NewGroupIconidx = hIcon ? ImageList_AddIcon(hCListImages, hIcon) : -1;
Skin_ReleaseIcon(hIcon);
CreateServiceFunction("CLISTMENUSGroup/ExecService",GroupMenuExecService);
@@ -292,7 +293,7 @@ void GroupMenus_Init(void) mi.pszService = "FindAdd/FindAddCommand";
mi.pszName = LPGEN("&Find/Add Contacts...");
AddGroupMenuItem(0, (LPARAM)&mi);
-
+
mi.position = 300000;
mi.pszService = "";
mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_MAINMENU); // eternity #004
@@ -321,32 +322,32 @@ void GroupMenus_Init(void) mi.position = 100000;
mi.hIcon = ske_ImageList_GetIcon(hCListImages,NewGroupIconidx,0);
mi.pszService = "CLISTMENUSGroup/CreateGroupHelper";
- mi.pszName = LPGEN("&New Group");
+ mi.pszName = LPGEN("&New Group");
hNewGroupMenuItem = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);
DestroyIcon_protect(mi.hIcon);
mi.position = 100001;
mi.hIcon = NULL;
mi.pszService = MS_CLIST_SETHIDEOFFLINE;
- mi.pszName = LPGEN("&Hide Offline Users");
+ mi.pszName = LPGEN("&Hide Offline Users");
gmp.lParam = 0;gmp.wParam = -1;
hHideOfflineUsersMenuItem = (HGENMENU)AddGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);
-
+
mi.position = 100002;
mi.pszService = "CLISTMENUSGroup/HideOfflineRootHelper";
- mi.pszName = LPGEN("Hide &Offline Users out here");
+ mi.pszName = LPGEN("Hide &Offline Users out here");
hHideOfflineUsersOutHereMenuItem = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);
mi.position = 100003;
mi.pszService = "CLISTMENUSGroup/HideGroupsHelper";
- mi.pszName = LPGEN("Hide &Empty Groups");
+ mi.pszName = LPGEN("Hide &Empty Groups");
hHideEmptyGroupsMenuItem = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);
mi.position = 100004;
mi.pszService = "CLISTMENUSGroup/UseGroupsHelper";
- mi.pszName = LPGEN("Disable &Groups");
+ mi.pszName = LPGEN("Disable &Groups");
hDisableGroupsMenuItem = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);
-
+
HookEvent(ME_SKIN2_ICONSCHANGED, OnIconLibIconChanged);
}
@@ -396,10 +397,10 @@ static int OnBuildSubGroupMenu(WPARAM wParam,LPARAM lParam) CLISTMENUITEM mi = { sizeof(mi) };
mi.flags = CMIM_FLAGS | ((group->hideOffline && !gray1)?CMIF_CHECKED:0)| (gray1?CMIF_GRAYED:0);
- Menu_ModifyItem(hHideOfflineUsersHereMenuItem, &mi);
+ Menu_ModifyItem(hHideOfflineUsersHereMenuItem, &mi);
mi.flags = CMIM_FLAGS | ((showOfflineinGroup && !gray2) ? CMIF_CHECKED:0)| (gray2?CMIF_GRAYED:0);
- Menu_ModifyItem(hShowOfflineUsersHereMenuItem, &mi);
+ Menu_ModifyItem(hShowOfflineUsersHereMenuItem, &mi);
return 0;
}
@@ -409,12 +410,12 @@ INT_PTR BuildSubGroupMenu(WPARAM wParam,LPARAM lParam) param.MenuObjectHandle = hSubGroupMenuObject;
param.wParam = wParam;
param.lParam = lParam;
-
+
//hMenu = hMainMenu;
HMENU hMenu = CreatePopupMenu();
//hMenu = wParam;
int tick = GetTickCount();
-
+
NotifyEventHooks(g_CluiData.hEventPreBuildSubGroupMenu,wParam,0);
CallService(MO_BUILDMENU,(WPARAM)hMenu,(LPARAM)¶m);
@@ -439,7 +440,7 @@ static INT_PTR AddSubGroupMenuItem(WPARAM wParam,LPARAM lParam) lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)mir_calloc(sizeof(SubGroupMenuExecParam));
if ( mmep == NULL)
return 0;
-
+
//we need just one parametr.
mmep->szServiceName = mir_strdup(mi->pszService);
mmep->Param1 = mi->popupPosition;
@@ -487,13 +488,13 @@ INT_PTR SubGroupMenuonAddService(WPARAM wParam,LPARAM lParam) INT_PTR SubGroupMenuExecService(WPARAM wParam,LPARAM lParam)
{
if (wParam != 0) {
- lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)wParam;
+ lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)wParam;
if ( !mir_strcmp(mmep->szServiceName, "Help/AboutCommand")) {
//bug in help.c,it used wparam as parent window handle without reason.
mmep->Param1 = 0;
- CallService(mmep->szServiceName,mmep->Param1,lParam);
+ CallService(mmep->szServiceName,mmep->Param1,lParam);
}
- else CallService(mmep->szServiceName,mmep->Param1,lParam);
+ else CallService(mmep->szServiceName,mmep->Param1,lParam);
}
return 1;
}
@@ -545,7 +546,7 @@ void InitSubGroupMenus(void) mi.position = 1000;
mi.hIcon = ske_ImageList_GetIcon(hCListImages,NewGroupIconidx,0);
mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";
- mi.pszName = LPGEN("&New SubGroup");
+ mi.pszName = LPGEN("&New SubGroup");
gmp.lParam = 0;gmp.wParam = POPUP_NEWSUBGROUP;
hNewSubGroupMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);
DestroyIcon_protect(mi.hIcon);
@@ -553,7 +554,7 @@ void InitSubGroupMenus(void) mi.position = 1001;
mi.hIcon = NULL;
mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";
- mi.pszName = LPGEN("&Hide Offline Users in here");
+ mi.pszName = LPGEN("&Hide Offline Users in here");
gmp.lParam = 0;
gmp.wParam = POPUP_GROUPHIDEOFFLINE;
hHideOfflineUsersHereMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);
@@ -561,7 +562,7 @@ void InitSubGroupMenus(void) mi.position = 1002;
mi.hIcon = NULL;
mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";
- mi.pszName = LPGEN("&Show Offline Users in here");
+ mi.pszName = LPGEN("&Show Offline Users in here");
gmp.lParam = 0;
gmp.wParam = POPUP_GROUPSHOWOFFLINE;
hShowOfflineUsersHereMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);
@@ -571,7 +572,7 @@ void InitSubGroupMenus(void) mi.position = 900001;
mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_RENAME);
mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";
- mi.pszName = LPGEN("&Rename Group");
+ mi.pszName = LPGEN("&Rename Group");
gmp.lParam = 0;gmp.wParam = POPUP_RENAMEGROUP;
AddSubGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);
DestroyIcon_protect(mi.hIcon);
@@ -579,7 +580,7 @@ void InitSubGroupMenus(void) mi.position = 900002;
mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_DELETE);
mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";
- mi.pszName = LPGEN("&Delete Group");
+ mi.pszName = LPGEN("&Delete Group");
gmp.lParam = 0;gmp.wParam = POPUP_DELETEGROUP;
AddSubGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);
DestroyIcon_protect(mi.hIcon);
diff --git a/plugins/Clist_modern/src/hdr/modern_awaymsg.h b/plugins/Clist_modern/src/hdr/modern_awaymsg.h index ea51c6ddb2..ced79d077f 100644 --- a/plugins/Clist_modern/src/hdr/modern_awaymsg.h +++ b/plugins/Clist_modern/src/hdr/modern_awaymsg.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -34,4 +35,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. void InitAwayMsgModule();
void UninitAwayMsgModule();
void amRequestAwayMsg(HANDLE hContact);
-
diff --git a/plugins/Clist_modern/src/hdr/modern_cache_funcs.h b/plugins/Clist_modern/src/hdr/modern_cache_funcs.h index a1b75b96af..8566333734 100644 --- a/plugins/Clist_modern/src/hdr/modern_cache_funcs.h +++ b/plugins/Clist_modern/src/hdr/modern_cache_funcs.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/hdr/modern_clc.h b/plugins/Clist_modern/src/hdr/modern_clc.h index 2fc25f638e..af1838b8a5 100644 --- a/plugins/Clist_modern/src/hdr/modern_clc.h +++ b/plugins/Clist_modern/src/hdr/modern_clc.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/hdr/modern_clist.h b/plugins/Clist_modern/src/hdr/modern_clist.h index 7a6d6c8489..ff9c776fd4 100644 --- a/plugins/Clist_modern/src/hdr/modern_clist.h +++ b/plugins/Clist_modern/src/hdr/modern_clist.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#pragma once
#ifndef _CLIST_H_
diff --git a/plugins/Clist_modern/src/hdr/modern_clui.h b/plugins/Clist_modern/src/hdr/modern_clui.h index 4360d183b7..0844ce63ab 100644 --- a/plugins/Clist_modern/src/hdr/modern_clui.h +++ b/plugins/Clist_modern/src/hdr/modern_clui.h @@ -1,13 +1,12 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Miranda NG: the free IM client for Microsoft* Windows*
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
-
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
@@ -22,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#ifndef modern_clui_h__
#define modern_clui_h__
@@ -45,7 +45,7 @@ public: static HRESULT InitClui() { m_pCLUI = new CLUI(); return S_OK; };
static HWND& ClcWnd() { return pcli->hwndContactTree; }
static HWND& CluiWnd() { return pcli->hwndContactList; }
- static CLUI * GetClui() { return m_pCLUI; }
+ static CLUI * GetClui() { return m_pCLUI; }
static BOOL IsMainMenuInited() { return CLUI::m_fMainMenuInited; }
CLINTERFACE void cliOnCreateClc();
@@ -53,7 +53,7 @@ public: EVENTHOOK( OnEvent_ModulesLoaded );
EVENTHOOK( OnEvent_ContactMenuPreBuild );
EVENTHOOK( OnEvent_FontReload );
-
+
SERVICE( Service_ShowMainMenu );
SERVICE( Service_ShowStatusMenu );
SERVICE( Service_Menu_ShowContactAvatar );
@@ -65,7 +65,7 @@ public: if ( !m_hWnd ) m_hWnd = hwnd;
BOOL bHandled = FALSE;
- LRESULT lRes= This->PreProcessWndProc( msg, wParam, lParam, bHandled );
+ LRESULT lRes= This->PreProcessWndProc( msg, wParam, lParam, bHandled );
if ( bHandled ) return lRes;
switch ( msg )
diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h index b040850808..f9424cb810 100644 --- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h +++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h @@ -3,9 +3,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/hdr/modern_defsettings.h b/plugins/Clist_modern/src/hdr/modern_defsettings.h index 7bae7516e8..00017423d8 100644 --- a/plugins/Clist_modern/src/hdr/modern_defsettings.h +++ b/plugins/Clist_modern/src/hdr/modern_defsettings.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2007 Artem Shpynov
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+Copyright 2007 Artem Shpynov
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -241,4 +242,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SETTINGS_BARAUTOSIZE_DEFAULT 1 //"ModernToolBar", "option_Bar0_Autosize"
#define SETTINGS_BARMULTILINE_DEFAULT 1 //"ModernToolBar", "option_Bar0_Multiline"
-#define SETTING_ENABLESOUNDS_DEFAULT 1 // !"Skin", "UseSound",
+#define SETTING_ENABLESOUNDS_DEFAULT 1 // !"Skin", "UseSound",
diff --git a/plugins/Clist_modern/src/hdr/modern_image_array.h b/plugins/Clist_modern/src/hdr/modern_image_array.h index 130c51ce95..203080e2f7 100644 --- a/plugins/Clist_modern/src/hdr/modern_image_array.h +++ b/plugins/Clist_modern/src/hdr/modern_image_array.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -21,7 +22,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Created by Pescuma
-
*/
#pragma once
@@ -32,14 +32,14 @@ Created by Pescuma #include <windows.h>
-typedef struct _IMAGE_ARRAY_DATA_NODE
+typedef struct _IMAGE_ARRAY_DATA_NODE
{
int width;
int height;
}
IMAGE_ARRAY_DATA_NODE;
-typedef struct _IMAGE_ARRAY_DATA
+typedef struct _IMAGE_ARRAY_DATA
{
// Configuration
BOOL width_based;
@@ -83,7 +83,7 @@ BOOL ImageArray_ChangeImage(LP_IMAGE_ARRAY_DATA iad, HBITMAP hBmp, int pos); // Remove an image
BOOL ImageArray_RemoveImage(LP_IMAGE_ARRAY_DATA iad, int pos);
-// Draw an image
+// Draw an image
BOOL ImageArray_DrawImage(LP_IMAGE_ARRAY_DATA iad, int pos, HDC hdcDest, int nXDest, int nYDest, BYTE Alpha);
diff --git a/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h b/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h index b6267364d0..ab65c2020d 100644 --- a/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h +++ b/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -21,7 +22,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Created by Pescuma
-
*/
#pragma once
diff --git a/plugins/Clist_modern/src/hdr/modern_skinselector.h b/plugins/Clist_modern/src/hdr/modern_skinselector.h index f443663420..09576c054d 100644 --- a/plugins/Clist_modern/src/hdr/modern_skinselector.h +++ b/plugins/Clist_modern/src/hdr/modern_skinselector.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/hdr/modern_static_clui.h b/plugins/Clist_modern/src/hdr/modern_static_clui.h index 3f31975f3c..c57e9b408d 100644 --- a/plugins/Clist_modern/src/hdr/modern_static_clui.h +++ b/plugins/Clist_modern/src/hdr/modern_static_clui.h @@ -1,13 +1,12 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* - -Copyright 2000-2008 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Miranda NG: the free IM client for Microsoft* Windows* +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-08 Miranda ICQ/IM project, +all portions of this codebase are copyrighted to the people listed in contributors.txt. - This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp index 1d14999269..bf39b955a6 100644 --- a/plugins/Clist_modern/src/init.cpp +++ b/plugins/Clist_modern/src/init.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/m_api/m_skin_eng.h b/plugins/Clist_modern/src/m_api/m_skin_eng.h index c610fbed0d..bcb3a0f3a9 100644 --- a/plugins/Clist_modern/src/m_api/m_skin_eng.h +++ b/plugins/Clist_modern/src/m_api/m_skin_eng.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -31,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /*defaults*/
#define DEFAULT_FIT_MODE FM_STRETCH
-#define DEFAULT_STYLE ST_BRUSH
+#define DEFAULT_STYLE ST_BRUSH
#define DEFAULT_BKCOLOUR GetSysColor(COLOR_3DFACE)
#define DEFAULT_SELBKCOLOUR GetSysColor(COLOR_HIGHLIGHT)
#define SIZING_MARGIN 3
@@ -68,7 +69,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /*SERVICES*/
-//toggle the 'hide offline contacts' flag and call CLUI
+//toggle the 'hide offline contacts' flag and call CLUI
//wParam=0
//lParam=0
#define MS_CLIST_TOGGLEHIDEOFFLINE "CList/ToggleHideOffline"
@@ -96,7 +97,7 @@ typedef struct s_DEF_SKIN_OBJECT_PARAMS } DEF_SKIN_OBJECT_PARAMS;
-// Request painting glyph object
+// Request painting glyph object
// wParam = pointer to SKINDRAWREQUEST structure
// lParam = 0
#define MS_SKIN_DRAWGLYPH "ModernList/DrawGlyph"
@@ -112,11 +113,11 @@ typedef struct s_SKINDRAWREQUEST char szObjectID[255]; // Unic Object ID (path) to paint
RECT rcDestRect; // Rectangle to fit
RECT rcClipRect; // Rectangle to paint in.
- HDC hDC; // Handler to device context to paint in.
+ HDC hDC; // Handler to device context to paint in.
} SKINDRAWREQUEST,*LPSKINDRAWREQUEST;
/* SKINOBJECTDESCRIPTOR opbject descriptor structure */
-typedef struct tagSKINOBJECTDESCRIPTOR
+typedef struct tagSKINOBJECTDESCRIPTOR
{
BYTE bType; // One of OT_* values.
char* szObjectID; // Unic Object ID (path) [255] max
@@ -126,9 +127,9 @@ typedef struct tagSKINOBJECTDESCRIPTOR /* SKINOBJECTDESCRIPTOR opbject descriptor structure */
typedef struct s_GLYPHOBJECT
{
- BYTE Style; // One of ST_* values
+ BYTE Style; // One of ST_* values
HBITMAP hGlyph; // Bitmap handler (for internal use only)
- DWORD dwTop, dwLeft, dwBottom, dwRight; // Margins
+ DWORD dwTop, dwLeft, dwBottom, dwRight; // Margins
char* szFileName; // FileName of image
DWORD dwColor; // Fill color
BYTE dwAlpha; // Constant alpha-transparency level
@@ -180,11 +181,11 @@ int __inline CreateGlyphedObject(char * ObjID); //// Creating and registering objects
//int __inline CreateGlyphedObject(char * ObjID)
-//{
+//{
// DEF_SKIN_OBJECT_PARAMS prm={0};
// prm.defColor=DEFAULT_BKCOLOUR;
// prm.defStyle=DEFAULT_STYLE;
-// prm.szObjectID=ObjID;
+// prm.szObjectID=ObjID;
// return CallService(MS_SKIN_REGISTERDEFOBJECT,(WPARAM)&prm,0);
//}
static BOOL __inline ScreenToClientRect(HWND hWnd, LPRECT lpRect)
@@ -222,7 +223,7 @@ static BOOL __inline ScreenToClientRect(HWND hWnd, LPRECT lpRect) // prm.defStyle=defStyle;
// prm.szObjectID=ObjID;
// return CallService(MS_SKIN_REGISTERDEFOBJECT,(WPARAM)&prm,0);
-//}
+//}
//int __inline CreateGlyphedObjectDefColor(char * ObjID,DWORD defColor)
//{
// DEF_SKIN_OBJECT_PARAMS prm={0};
@@ -230,7 +231,7 @@ static BOOL __inline ScreenToClientRect(HWND hWnd, LPRECT lpRect) // prm.defStyle=ST_BRUSH;
// prm.szObjectID=ObjID;
// return CallService(MS_SKIN_REGISTERDEFOBJECT,(WPARAM)&prm,0);
-//}
+//}
INT_PTR ske_Service_DrawGlyph(WPARAM wParam,LPARAM lParam);
int __inline SkinDrawGlyph(HDC hdc, RECT * rcSize, RECT * rcClip, char * objectID)
{
@@ -238,7 +239,7 @@ int __inline SkinDrawGlyph(HDC hdc, RECT * rcSize, RECT * rcClip, char * objectI if (!objectID) return 0;
rq.hDC=hdc;
rq.rcDestRect=*rcSize;
- rq.rcClipRect=*rcClip;
+ rq.rcClipRect=*rcClip;
strncpy(rq.szObjectID,objectID,SIZEOF(rq.szObjectID));
return ske_Service_DrawGlyph((WPARAM)&rq,0);
//return CallService(MS_SKIN_DRAWGLYPH,(WPARAM)&rq,0);
@@ -317,7 +318,7 @@ int __inline SkinInvalidateFrame(HWND hWnd, CONST RECT* lpRect) }
// Alpha channel GDI replacements/helpers
-//
+//
// Paints text with correct alpha channel
// wParam - pointer to AlphaTextOutParams
#define MS_SKINENG_ALPHATEXTOUT "SkinEngine/ske_AlphaTextOut"
@@ -358,7 +359,7 @@ MODERNFONTEFFECT; typedef struct DrawTextWithEffectParam_tag
{
- int cbSize;
+ int cbSize;
HDC hdc; // handle to DC
LPCTSTR lpchText; // text to draw
int cchText; // length of text to draw
@@ -371,19 +372,19 @@ typedef struct DrawTextWithEffectParam_tag #define MS_DRAW_TEXT_WITH_EFFECTW "Modern/SkinEngine/DrawTextWithEffectW"
#ifdef UNICODE
- #define MS_DRAW_TEXT_WITH_EFFECT MS_DRAW_TEXT_WITH_EFFECTW
+ #define MS_DRAW_TEXT_WITH_EFFECT MS_DRAW_TEXT_WITH_EFFECTW
#else
#define MS_DRAW_TEXT_WITH_EFFECT MS_DRAW_TEXT_WITH_EFFECTA
#endif
-// Helper
+// Helper
int __inline DrawTextWithEffect( HDC hdc, LPCTSTR lpchText, int cchText, RECT * lprc, UINT dwDTFormat, MODERNFONTEFFECT * pEffect )
{
DrawTextWithEffectParam params;
static BYTE bIfServiceExists = ServiceExists( MS_DRAW_TEXT_WITH_EFFECT ) ? 1 : 0;
if ( bIfServiceExists == 0 ) return DrawText ( hdc, lpchText, cchText, lprc, dwDTFormat );
-
- // else
+
+ // else
params.cbSize = sizeof( DrawTextWithEffectParam );
params.hdc = hdc;
params.lpchText = lpchText;
@@ -409,8 +410,8 @@ typedef struct _DrawIconFixParam int yTop;
HICON hIcon;
int cxWidth;
- int cyWidth;
- UINT istepIfAniCur;
+ int cyWidth;
+ UINT istepIfAniCur;
HBRUSH hbrFlickerFreeDraw;
UINT diFlags;
} DrawIconFixParam;
diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp index 02690cff9d..d241ea1565 100644 --- a/plugins/Clist_modern/src/modern_aniavatars.cpp +++ b/plugins/Clist_modern/src/modern_aniavatars.cpp @@ -1,8 +1,9 @@ -/**************************************************************************\
+/*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -19,18 +20,11 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
-****************************************************************************
+// File contains implementation of animated avatars in contact list
-Created: Mar 9, 2007
-
-Author: Artem Shpynov aka FYR: ashpynov@gmail.com
-
-****************************************************************************
-
-File contains implementation of animated avatars in contact list
-
-\**************************************************************************/
+***************************************************************************/
#include "hdr/modern_commonheaders.h"
@@ -297,7 +291,7 @@ int AniAva_AddAvatar(HANDLE hContact, TCHAR * szFilename, int width, int heigth) aacheck 0;
if ( !GDIPlus_IsAnimatedGif (szFilename))
return 0;
-
+
mir_cslock lck(s_CS);
//first try to find window for contact avatar
HWND hwnd = NULL;
@@ -626,10 +620,10 @@ static int _AniAva_LoadAvatarFromImage(TCHAR * szFileName, int width, int height // copy from old and from new strip
BitBlt(hNewDC, 0, 0, s_width,s_height,s_hAniAvaDC, 0, 0, SRCCOPY);
BitBlt(hNewDC,s_width, 0, paai->FrameSize.cx*paai->nFrameCount,paai->FrameSize.cy,hTempDC, 0, 0, SRCCOPY);
-
+
paai->nStripTop = s_width;
s_AniAvatarList.insert(paai);
-
+
GdiFlush();
//remove temp DC
SelectObject(hTempDC,hOldBitmap);
@@ -694,7 +688,7 @@ static void _AniAva_RenderAvatar(ANIAVA_WINDOWINFO * dat, HDC hdcParent /*= NULL {
if (dat->bPaused>0) { dat->bPended = TRUE; return; }
else dat->bPended = FALSE;
-
+
if ( IMMEDIATE_DRAW && hdcParent == NULL ) return;
GdiFlush();
@@ -744,7 +738,7 @@ static void _AniAva_RenderAvatar(ANIAVA_WINDOWINFO * dat, HDC hdcParent /*= NULL SelectObject(tempDC, hOldBrush);
DeleteObject(hBrush);
DeleteObject(rgnOutside);
- }
+ }
else if ( cornerRadius > 0 )
// else create clipping area (round corners)
hRgn = CreateRoundRectRgn(0, 0, szWnd.cx+1, szWnd.cy+1, cornerRadius << 1, cornerRadius << 1);
@@ -873,7 +867,7 @@ static void _AniAva_LoadOptions() mir_cslock lck(s_CS);
s_bFlags = ( db_get_b(NULL,"CList","AvatarsDrawBorders",SETTINGS_AVATARDRAWBORDER_DEFAULT)? AAO_HAS_BORDER :0) |
- ( db_get_b(NULL,"CList","AvatarsRoundCorners",SETTINGS_AVATARROUNDCORNERS_DEFAULT)? AAO_ROUND_CORNERS :0) |
+ ( db_get_b(NULL,"CList","AvatarsRoundCorners",SETTINGS_AVATARROUNDCORNERS_DEFAULT)? AAO_ROUND_CORNERS :0) |
( db_get_b(NULL,"CList","AvatarsDrawOverlay",SETTINGS_AVATARDRAWOVERLAY_DEFAULT)? AAO_HAS_OVERLAY :0) |
((0) ? AAO_OPAQUE :0);
@@ -898,7 +892,7 @@ static void _AniAva_LoadOptions() }
if (s_bFlags & AAO_OPAQUE)
s_bkgColor = 0;
- s_bSeparateWindow = db_get_b(NULL,"CList","AvatarsInSeparateWnd",SETTINGS_AVATARINSEPARATE_DEFAULT);
+ s_bSeparateWindow = db_get_b(NULL,"CList","AvatarsInSeparateWnd",SETTINGS_AVATARINSEPARATE_DEFAULT);
}
static int _AniAva_SortAvatarInfo(const ANIAVA_INFO *aai1, const ANIAVA_INFO *aai2)
@@ -944,7 +938,7 @@ static LRESULT CALLBACK _AniAva_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case AAM_RESUME:
dat->bPaused--;
if (dat->bPaused) return 0;
- if (dat->bPended)
+ if (dat->bPended)
if ( !IMMEDIATE_DRAW )
_AniAva_RenderAvatar(dat);
dat->bPended = FALSE;
@@ -1000,7 +994,7 @@ static LRESULT CALLBACK _AniAva_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR SetWindowPos(hwnd,HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_ASYNCWINDOWPOS);
else {
LONG exStyle = GetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE);
- SetWindowPos(pcli->hwndContactList,hwnd, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE/*|SWP_ASYNCWINDOWPOS*/);
+ SetWindowPos(pcli->hwndContactList,hwnd, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE/*|SWP_ASYNCWINDOWPOS*/);
if ( !(exStyle & WS_EX_TOPMOST))
SetWindowPos(pcli->hwndContactList,HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE/*|SWP_ASYNCWINDOWPOS*/);
}
diff --git a/plugins/Clist_modern/src/modern_awaymsg.cpp b/plugins/Clist_modern/src/modern_awaymsg.cpp index 5a9f296df4..6801f182b1 100644 --- a/plugins/Clist_modern/src/modern_awaymsg.cpp +++ b/plugins/Clist_modern/src/modern_awaymsg.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -19,7 +20,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
*/
/*
@@ -80,26 +80,26 @@ static HANDLE amGetCurrentChain() static void amThreadProc(void *)
{
thread_catcher lck(g_hAwayMsgThread);
-
+
ClcCacheEntry dnce;
memset(&dnce, 0, sizeof(dnce));
while (!MirandaExiting()) {
- HANDLE hContact = amGetCurrentChain();
- while (hContact) {
+ HANDLE hContact = amGetCurrentChain();
+ while (hContact) {
DWORD time = GetTickCount();
if ((time-amRequestTick) < AMASKPERIOD) {
SleepEx(AMASKPERIOD-(time-amRequestTick)+10, TRUE);
if ( MirandaExiting())
- return;
+ return;
}
CListSettings_FreeCacheItemData(&dnce);
dnce.hContact = (HANDLE)hContact;
Sync(CLUI_SyncGetPDNCE, (WPARAM) 0, (LPARAM)&dnce);
-
+
HANDLE ACK = 0;
if (dnce.ApparentMode != ID_STATUS_OFFLINE) //don't ask if contact is always invisible (should be done with protocol)
- ACK = (HANDLE)CallContactService(hContact,PSS_GETAWAYMSG, 0, 0);
+ ACK = (HANDLE)CallContactService(hContact,PSS_GETAWAYMSG, 0, 0);
if ( !ACK) {
ACKDATA ack;
ack.hContact = hContact;
@@ -124,7 +124,7 @@ static void amThreadProc(void *) }
else break;
if ( MirandaExiting())
- return;
+ return;
}
WaitForSingleObjectEx(hamProcessEvent, INFINITE, TRUE);
ResetEvent(hamProcessEvent);
@@ -148,19 +148,19 @@ BOOL amWakeThread() */
void amRequestAwayMsg(HANDLE hContact)
{
- if ( !g_CluiData.bInternalAwayMsgDiscovery || !hContact)
+ if ( !g_CluiData.bInternalAwayMsgDiscovery || !hContact)
return;
- //Do not re-ask for chat rooms
+ //Do not re-ask for chat rooms
char *szProto = GetContactProto(hContact);
if (szProto != NULL && !db_get_b(hContact, szProto, "ChatRoom", 0))
- amAddHandleToChain(hContact);
+ amAddHandleToChain(hContact);
}
void InitAwayMsgModule()
{
InitializeCriticalSection(&amCS);
- hamProcessEvent = CreateEvent(NULL,FALSE,FALSE,NULL);
+ hamProcessEvent = CreateEvent(NULL,FALSE,FALSE,NULL);
g_hAwayMsgThread = mir_forkthread(amThreadProc, 0);
}
diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp index dd8ecdaa3d..1333682716 100644 --- a/plugins/Clist_modern/src/modern_cachefuncs.cpp +++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp @@ -1,11 +1,10 @@ -/* CODE STYLE */
-
/*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -24,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Created by Pescuma
Modified by FYR
-
*/
/************************************************************************/
@@ -59,7 +57,7 @@ void CListSettings_FreeCacheItemDataOption( ClcCacheEntry *pDst, DWORD flag ); void Cache_GetTimezone(ClcData *dat, HANDLE hContact)
{
ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(hContact);
- if (dat == NULL && pcli->hwndContactTree)
+ if (dat == NULL && pcli->hwndContactTree)
dat = (ClcData *)GetWindowLongPtr(pcli->hwndContactTree,0);
if (dat && dat->hWnd == pcli->hwndContactTree) {
@@ -70,7 +68,7 @@ void Cache_GetTimezone(ClcData *dat, HANDLE hContact) /*
* Get all lines of text
- */
+ */
void Cache_GetText(ClcData *dat, ClcContact *contact, BOOL forceRenew)
{
@@ -142,9 +140,9 @@ void CSmileyString::_CopySmileyList( SortedList *plInput ) ClcContactTextPiece *pieceFrom = (ClcContactTextPiece *) plInput->items[i];
if ( pieceFrom != NULL )
{
- ClcContactTextPiece *piece = (ClcContactTextPiece *) mir_alloc( sizeof(ClcContactTextPiece));
+ ClcContactTextPiece *piece = (ClcContactTextPiece *) mir_alloc( sizeof(ClcContactTextPiece));
*piece = *pieceFrom;
- if ( pieceFrom->type == TEXT_PIECE_TYPE_SMILEY)
+ if ( pieceFrom->type == TEXT_PIECE_TYPE_SMILEY)
piece->smiley = CopyIcon( pieceFrom->smiley );
List_Insert( plText, piece, plText->realCount );
}
@@ -287,11 +285,11 @@ void CSmileyString::ReplaceSmileys(struct SHORTDATA *dat, ClcCacheEntry *pdnce, * Getting Status name
* -1 for XStatus, 1 for Status
*/
-int GetStatusName(TCHAR *text, int text_size, ClcCacheEntry *pdnce, BOOL xstatus_has_priority)
+int GetStatusName(TCHAR *text, int text_size, ClcCacheEntry *pdnce, BOOL xstatus_has_priority)
{
BOOL noAwayMsg = FALSE;
BOOL noXstatus = FALSE;
- // Hide status text if Offline /// no offline
+ // Hide status text if Offline /// no offline
WORD nStatus = pdnce___GetStatus( pdnce );
if ((nStatus == ID_STATUS_OFFLINE || nStatus == 0) && g_CluiData.bRemoveAwayMessageForOffline) noAwayMsg = TRUE;
if (nStatus == ID_STATUS_OFFLINE || nStatus == 0) noXstatus = TRUE;
@@ -355,13 +353,13 @@ void GetListeningTo(TCHAR *text, int text_size, ClcCacheEntry *pdnce) * -1 for XStatus, 1 for Status
*/
-int GetStatusMessage(TCHAR *text, int text_size, ClcCacheEntry *pdnce, BOOL xstatus_has_priority)
+int GetStatusMessage(TCHAR *text, int text_size, ClcCacheEntry *pdnce, BOOL xstatus_has_priority)
{
DBVARIANT dbv = {0};
BOOL noAwayMsg = FALSE;
WORD wStatus = pdnce___GetStatus( pdnce );
text[0] = '\0';
- // Hide status text if Offline /// no offline
+ // Hide status text if Offline /// no offline
if (wStatus == ID_STATUS_OFFLINE || wStatus == 0) noAwayMsg = TRUE;
// Get XStatusMsg
@@ -410,8 +408,8 @@ int GetStatusMessage(TCHAR *text, int text_size, ClcCacheEntry *pdnce, BOOL xst * Get the text for specified lines
*/
int Cache_GetLineText(
- ClcCacheEntry *pdnce, int type, LPTSTR text, int text_size, TCHAR *variable_text, BOOL xstatus_has_priority,
- BOOL show_status_if_no_away, BOOL show_listening_if_no_away, BOOL use_name_and_message_for_xstatus,
+ ClcCacheEntry *pdnce, int type, LPTSTR text, int text_size, TCHAR *variable_text, BOOL xstatus_has_priority,
+ BOOL show_status_if_no_away, BOOL show_listening_if_no_away, BOOL use_name_and_message_for_xstatus,
BOOL pdnce_time_show_only_if_different)
{
text[0] = '\0';
@@ -453,7 +451,7 @@ int Cache_GetLineText( if ( !db_get_ts(pdnce->hContact, pdnce->m_cache_cszProto, "XStatusName", &dbv)) {
if (dbv.pszVal != NULL && dbv.pszVal[0] != 0) {
TCHAR *tmp = NEWTSTR_ALLOCA(text);
- mir_sntprintf(text, text_size, _T("%s: %s"), dbv.pszVal, tmp);
+ mir_sntprintf(text, text_size, _T("%s: %s"), dbv.pszVal, tmp);
}
CopySkipUnprintableChars(text, text, text_size-1);
db_free(&dbv);
@@ -479,7 +477,7 @@ int Cache_GetLineText( if (show_status_if_no_away) {
//re-request status if no away
- return Cache_GetLineText(pdnce, TEXT_STATUS, text, text_size, variable_text, xstatus_has_priority, 0, 0, use_name_and_message_for_xstatus, pdnce_time_show_only_if_different);
+ return Cache_GetLineText(pdnce, TEXT_STATUS, text, text_size, variable_text, xstatus_has_priority, 0, 0, use_name_and_message_for_xstatus, pdnce_time_show_only_if_different);
}
}
return TEXT_STATUS_MESSAGE;
@@ -540,7 +538,7 @@ void Cache_GetFirstLineText(ClcData *dat, ClcContact *contact) if ( !dat->force_in_dialog) {
struct SHORTDATA data = {0};
- Sync(CLUI_SyncGetShortData,(WPARAM)pcli->hwndContactTree,(LPARAM)&data);
+ Sync(CLUI_SyncGetShortData,(WPARAM)pcli->hwndContactTree,(LPARAM)&data);
contact->ssText.ReplaceSmileys(&data, pdnce, contact->szText, dat->first_line_draw_smileys);
}
}
@@ -554,7 +552,7 @@ void Cache_GetSecondLineText(struct SHORTDATA *dat, ClcCacheEntry *pdnce) TCHAR Text[240-EXTRA_ICON_COUNT] = {0};
int type = TEXT_EMPTY;
- if (dat->second_line_show)
+ if (dat->second_line_show)
type = Cache_GetLineText(pdnce, dat->second_line_type, (TCHAR*)Text, SIZEOF(Text), dat->second_line_text,
dat->second_line_xstatus_has_priority,dat->second_line_show_status_if_no_away,dat->second_line_show_listening_if_no_away,
dat->second_line_use_name_and_message_for_xstatus, dat->contact_time_show_only_if_different);
@@ -637,11 +635,11 @@ static int CopySkipUnprintableChars(TCHAR *to, TCHAR * buf, DWORD size) if ( !keep) cp++;
keep = 1;
}
- else {
+ else {
keep = 0;
*cp = buf[i];
cp++;
- }
+ }
}
*cp = 0;
@@ -652,7 +650,7 @@ static int CopySkipUnprintableChars(TCHAR *to, TCHAR * buf, DWORD size) RemoveTag(to,_T("<b>")); RemoveTag(to,_T("</b>"));
RemoveTag(to,_T("<u>")); RemoveTag(to,_T("</u>"));
- RemoveTag(to,_T("<i>")); RemoveTag(to,_T("</i>"));
+ RemoveTag(to,_T("<i>")); RemoveTag(to,_T("</i>"));
RemoveTag(to,_T("[B]")); RemoveTag(to,_T("[/b]"));
RemoveTag(to,_T("[U]")); RemoveTag(to,_T("[/u]"));
@@ -689,7 +687,7 @@ static BOOL ExecuteOnAllContactsOfGroup(ClcGroup *group, ExecuteOnAllContactsFun return FALSE;
}
}
- else if (group->cl.items[scanIndex]->type == CLCIT_GROUP)
+ else if (group->cl.items[scanIndex]->type == CLCIT_GROUP)
if ( !ExecuteOnAllContactsOfGroup(group->cl.items[scanIndex]->group, func, param))
return FALSE;
}
@@ -749,7 +747,7 @@ void Cache_ProceedAvatarInList(ClcData *dat, ClcContact *contact) if (height_clip * ace->bmWidth / ace->bmHeight <= width_clip)
width_clip = height_clip * ace->bmWidth / ace->bmHeight;
else
- height_clip = width_clip * ace->bmHeight / ace->bmWidth;
+ height_clip = width_clip * ace->bmHeight / ace->bmWidth;
if (wildcmpit(contact->avatar_data->szFilename,_T("*.gif"))) {
if (old_pos == AVATAR_POS_ANIMATED)
@@ -766,7 +764,7 @@ void Cache_ProceedAvatarInList(ClcData *dat, ClcContact *contact) // Create objs
void * pt;
- HDC hdc = CreateCompatibleDC(dat->avatar_cache.hdc);
+ HDC hdc = CreateCompatibleDC(dat->avatar_cache.hdc);
HBITMAP hDrawBmp = ske_CreateDIB32Point(width_clip, height_clip,&pt);
HBITMAP oldBmp = (HBITMAP)SelectObject(hdc, hDrawBmp);
//need to draw avatar bitmap here
@@ -810,7 +808,7 @@ void Cache_GetAvatar(ClcData *dat, ClcContact *contact) contact->avatar_data = NULL;
if (contact->avatar_data != NULL)
- contact->avatar_data->t_lastAccess = (DWORD)time(NULL);
+ contact->avatar_data->t_lastAccess = (DWORD)time(NULL);
}
else contact->avatar_data = NULL;
@@ -827,7 +825,7 @@ void Cache_GetAvatar(ClcData *dat, ClcContact *contact) BITMAP bm;
if (GetObject(hBmp,sizeof(BITMAP),&bm)) {
// Create data...
- HDC hdc;
+ HDC hdc;
HBITMAP hDrawBmp,oldBmp;
// Make bounds -> keep aspect radio
@@ -842,10 +840,10 @@ void Cache_GetAvatar(ClcData *dat, ClcContact *contact) if (height_clip * bm.bmWidth / bm.bmHeight <= width_clip)
width_clip = height_clip * bm.bmWidth / bm.bmHeight;
else
- height_clip = width_clip * bm.bmHeight / bm.bmWidth;
+ height_clip = width_clip * bm.bmHeight / bm.bmWidth;
// Create objs
- hdc = CreateCompatibleDC(dat->avatar_cache.hdc);
+ hdc = CreateCompatibleDC(dat->avatar_cache.hdc);
hDrawBmp = ske_CreateDIB32(width_clip, height_clip);
oldBmp = (HBITMAP)SelectObject(hdc, hDrawBmp);
SetBkMode(hdc,TRANSPARENT);
@@ -860,7 +858,7 @@ void Cache_GetAvatar(ClcData *dat, ClcContact *contact) // Draw bitmap 8//8
HDC dcMem = CreateCompatibleDC(hdc);
- HBITMAP obmp = (HBITMAP)SelectObject(dcMem, hBmp);
+ HBITMAP obmp = (HBITMAP)SelectObject(dcMem, hBmp);
StretchBlt(hdc, 0, 0, width_clip, height_clip,dcMem, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY);
SelectObject(dcMem,obmp);
DeleteDC(dcMem);
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index 586834ad5c..8778863d15 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -1,9 +1,9 @@ -// refactored step 1.
/*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -389,7 +389,7 @@ static BOOL clcItemNotHiddenOffline(ClcData *dat, ClcGroup* group, ClcContact *c ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(contact->hContact);
if (!pdnce) return FALSE;
if (pdnce->m_cache_nNoHiddenOffline) return TRUE;
-
+
if (!group) return FALSE;
if (group->hideOffline) return FALSE;
@@ -898,7 +898,7 @@ static LRESULT clcOnLButtonDown(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam }
}
- if (hit != -1 && !(hitFlags & CLCHT_NOWHERE) && contact->type == CLCIT_CONTACT && contact->SubAllocated && !contact->isSubcontact)
+ if (hit != -1 && !(hitFlags & CLCHT_NOWHERE) && contact->type == CLCIT_CONTACT && contact->SubAllocated && !contact->isSubcontact)
if (hitFlags&CLCHT_ONITEMICON && dat->expandMeta)
{
BYTE doubleClickExpand = db_get_b(NULL,"CLC","MetaDoubleClick",SETTING_METAAVOIDDBLCLICK_DEFAULT);
@@ -1251,7 +1251,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, switch(target) {
case DROPTARGET_ONSELF:
break;
-
+
case DROPTARGET_ONCONTACT:
if ( ServiceExists(MS_MC_ADDTOMETA)) {
ClcContact *contDest, *contSour;
diff --git a/plugins/Clist_modern/src/modern_clcidents.cpp b/plugins/Clist_modern/src/modern_clcidents.cpp index a443492ac6..5ed82a4aec 100644 --- a/plugins/Clist_modern/src/modern_clcidents.cpp +++ b/plugins/Clist_modern/src/modern_clcidents.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_clc.h"
#include "hdr/modern_commonprototypes.h"
@@ -68,7 +70,7 @@ int cliGetRowsPriorTo(ClcGroup *group,ClcGroup *subgroup,int contactIndex) }
if (group == subgroup && contactIndex-subcontactscount == group->scanIndex) return count;
count++;
-
+
/* if ((group->cl.items[group->scanIndex]->type == CLCIT_CONTACT) && (group->cl.items[group->scanIndex].flags & CONTACTF_STATUSMSG)) {
count++;
}
@@ -89,7 +91,7 @@ int cliGetRowsPriorTo(ClcGroup *group,ClcGroup *subgroup,int contactIndex) {
int rows = (group->cl.items[group->scanIndex]->SubAllocated*group->cl.items[group->scanIndex]->SubExpanded*k);
if (group->scanIndex+rows >= contactIndex)
- return count+(contactIndex-group->scanIndex)-1;
+ return count+(contactIndex-group->scanIndex)-1;
}
}
if (group->cl.items[group->scanIndex]->type == CLCIT_CONTACT)
@@ -112,7 +114,7 @@ int FindItem(HWND hwnd,ClcData *dat,HANDLE hItem,ClcContact **contact,ClcGroup * int index = 0, i;
int nowVisible = 1;
ClcGroup *group;
-
+
group = &dat->list;
group->scanIndex = 0;
@@ -126,9 +128,9 @@ int FindItem(HWND hwnd,ClcData *dat,HANDLE hItem,ClcContact **contact,ClcGroup * nowVisible = 1;
for (tgroup = group;tgroup;tgroup = tgroup->parent)
{
- if ( !tgroup->expanded)
+ if ( !tgroup->expanded)
{
- nowVisible = 0;
+ nowVisible = 0;
break;
}
}
@@ -136,15 +138,15 @@ int FindItem(HWND hwnd,ClcData *dat,HANDLE hItem,ClcContact **contact,ClcGroup * continue;
}
if (nowVisible) index++;
- if ((IsHContactGroup(hItem) && group->cl.items[group->scanIndex]->type == CLCIT_GROUP && ((UINT_PTR)hItem&~HCONTACT_ISGROUP) == group->cl.items[group->scanIndex]->groupId) ||
- (IsHContactContact(hItem) && group->cl.items[group->scanIndex]->type == CLCIT_CONTACT && group->cl.items[group->scanIndex]->hContact == hItem) ||
- (IsHContactInfo(hItem) && group->cl.items[group->scanIndex]->type == CLCIT_INFO && group->cl.items[group->scanIndex]->hContact == (HANDLE)((UINT_PTR)hItem&~HCONTACT_ISINFO)))
+ if ((IsHContactGroup(hItem) && group->cl.items[group->scanIndex]->type == CLCIT_GROUP && ((UINT_PTR)hItem&~HCONTACT_ISGROUP) == group->cl.items[group->scanIndex]->groupId) ||
+ (IsHContactContact(hItem) && group->cl.items[group->scanIndex]->type == CLCIT_CONTACT && group->cl.items[group->scanIndex]->hContact == hItem) ||
+ (IsHContactInfo(hItem) && group->cl.items[group->scanIndex]->type == CLCIT_INFO && group->cl.items[group->scanIndex]->hContact == (HANDLE)((UINT_PTR)hItem&~HCONTACT_ISINFO)))
{
if (isVisible) {
if ( !nowVisible) *isVisible = 0;
else {
int posy = cliGetRowTopY(dat,index+1);
- if (posy < dat->yScroll)
+ if (posy < dat->yScroll)
*isVisible = 0;
else {
RECT clRect;
@@ -156,30 +158,30 @@ int FindItem(HWND hwnd,ClcData *dat,HANDLE hItem,ClcContact **contact,ClcGroup * }
if (contact) *contact = group->cl.items[group->scanIndex];
if (subgroup) *subgroup = group;
-
+
return 1;
}
- if ( !isIgnoreSubcontacts &&
- IsHContactContact(hItem) &&
- group->cl.items[group->scanIndex]->type == CLCIT_CONTACT &&
+ if ( !isIgnoreSubcontacts &&
+ IsHContactContact(hItem) &&
+ group->cl.items[group->scanIndex]->type == CLCIT_CONTACT &&
group->cl.items[group->scanIndex]->SubAllocated > 0)
{
for (i=0; i < group->cl.items[group->scanIndex]->SubAllocated; i++)
{
if (group->cl.items[group->scanIndex]->subcontacts[i].hContact == hItem)
- {
+ {
#ifdef _DEBUG
if (IsBadWritePtr(&group->cl.items[group->scanIndex]->subcontacts[i], sizeof(ClcContact)))
{
log1("FindIltem->IsBadWritePtr | 2o [%08x]", &group->cl.items[group->scanIndex]->subcontacts[i]);
PostMessage(hwnd,CLM_AUTOREBUILD, 0, 0);
-
+
return 0;
}
#endif
if (contact) *contact = &group->cl.items[group->scanIndex]->subcontacts[i];
if (subgroup) *subgroup = group;
-
+
return 1;
}
}
@@ -193,7 +195,7 @@ int FindItem(HWND hwnd,ClcData *dat,HANDLE hItem,ClcContact **contact,ClcGroup * }
group->scanIndex++;
}
-
+
if (isVisible) *isVisible = FALSE;
if (contact) *contact = NULL;
if (subgroup) *subgroup = NULL;
@@ -202,7 +204,7 @@ int FindItem(HWND hwnd,ClcData *dat,HANDLE hItem,ClcContact **contact,ClcGroup * void ClearRowByIndexCache()
{
- if ( !CacheIndexClear)
+ if ( !CacheIndexClear)
{
memset(CacheIndex, 0, sizeof(CacheIndex));
CacheIndexClear = TRUE;
@@ -223,7 +225,7 @@ int cliGetRowByIndex(ClcData *dat,int testindex,ClcContact **contact,ClcGroup ** group->scanIndex++;
continue;
}
- if ((index>0) && (index < CacheArrSize))
+ if ((index>0) && (index < CacheArrSize))
{
CacheIndex[index] = group;
CacheIndexClear = FALSE;
@@ -241,14 +243,14 @@ int cliGetRowByIndex(ClcData *dat,int testindex,ClcContact **contact,ClcGroup ** {
for (i=0; i < group->cl.items[group->scanIndex]->SubAllocated; i++)
{
- if ((index>0) && (index < CacheArrSize))
+ if ((index>0) && (index < CacheArrSize))
{
CacheIndex[index] = group;
CacheIndexClear = FALSE;
};
index++;
if (testindex == index) {
- if (contact)
+ if (contact)
{
*contact = &group->cl.items[group->scanIndex]->subcontacts[i];
(*contact)->subcontacts = group->cl.items[group->scanIndex];
diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp index cecc7ff49a..5b16bfc044 100644 --- a/plugins/Clist_modern/src/modern_clcitems.cpp +++ b/plugins/Clist_modern/src/modern_clcitems.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_clc.h"
#include "hdr/modern_clist.h"
@@ -98,7 +100,7 @@ int cli_AddItemToGroup(ClcGroup *group,int iAboveItem) ClcGroup *cli_AddGroup(HWND hwnd,ClcData *dat,const TCHAR *szName, DWORD flags,int groupId,int calcTotalMembers)
{
- ClearRowByIndexCache();
+ ClearRowByIndexCache();
if ( !dat->force_in_dialog && !(GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN))
if ( !lstrcmp(_T("-@-HIDDEN-GROUP-@-"),szName)) { //group is hidden
ClearRowByIndexCache();
@@ -160,17 +162,17 @@ static void _LoadDataToContact(ClcContact *cont, ClcGroup *group, ClcData *dat, cont->image_is_special = FALSE;
cont->hContact = hContact;
- pcli->pfnInvalidateDisplayNameCacheEntry(hContact);
- cacheEntry = pcli->pfnGetCacheEntry(hContact);
-
+ pcli->pfnInvalidateDisplayNameCacheEntry(hContact);
+ cacheEntry = pcli->pfnGetCacheEntry(hContact);
+
szProto = cacheEntry->m_cache_cszProto;
cont->proto = szProto;
if (szProto != NULL && !pcli->pfnIsHiddenMode(dat,pdnce___GetStatus( cacheEntry )))
cont->flags |= CONTACTF_ONLINE;
-
+
apparentMode = szProto != NULL?cacheEntry->ApparentMode:0;
-
+
if (apparentMode)
switch (apparentMode)
{
@@ -183,19 +185,19 @@ static void _LoadDataToContact(ClcContact *cont, ClcGroup *group, ClcData *dat, default:
cont->flags |= CONTACTF_VISTO|CONTACTF_INVISTO;
}
-
- if (cacheEntry->NotOnList)
+
+ if (cacheEntry->NotOnList)
cont->flags |= CONTACTF_NOTONLIST;
idleMode = szProto != NULL?cacheEntry->IdleTS:0;
-
- if (idleMode)
+
+ if (idleMode)
cont->flags |= CONTACTF_IDLE;
-
+
//Add subcontacts
if (szProto)
- {
- if ( g_szMetaModuleName && dat->IsMetaContactsEnabled && mir_strcmp(cont->proto,g_szMetaModuleName) == 0)
+ {
+ if ( g_szMetaModuleName && dat->IsMetaContactsEnabled && mir_strcmp(cont->proto,g_szMetaModuleName) == 0)
AddSubcontacts(dat,cont,CLCItems_IsShowOfflineGroup(group));
}
cont->lastPaintCounter = 0;
@@ -283,7 +285,7 @@ void cli_DeleteItemFromTree(HWND hwnd,HANDLE hItem) //check here contacts are not resorting
if (hwnd == pcli->hwndContactTree)
- pcli->pfnFreeCacheItem( pcli->pfnGetCacheEntry(hItem));
+ pcli->pfnFreeCacheItem( pcli->pfnGetCacheEntry(hItem));
dat->needsResort = 1;
ClearRowByIndexCache();
}
@@ -324,10 +326,10 @@ int RestoreSelection( ClcData *dat, HANDLE hSelected ) dat->selection = pcli->pfnGetRowsPriorTo( &dat->list, selgroup, List_IndexOf((SortedList*)&selgroup->cl, selcontact ));
}
else
- {
+ {
dat->selection = pcli->pfnGetRowsPriorTo(&dat->list, selgroup, List_IndexOf((SortedList*)&selgroup->cl, selcontact->subcontacts ));
-
- if (dat->selection != -1 )
+
+ if (dat->selection != -1 )
dat->selection += selcontact->isSubcontact;
}
return dat->selection;
@@ -399,7 +401,7 @@ void cliRebuildEntireList(HWND hwnd,ClcData *dat) else cont = AddContactToGroup(dat,group,cacheEntry);
}
}
- if (cont) {
+ if (cont) {
cont->SubAllocated = 0;
if (cont->proto && g_szMetaModuleName && dat->IsMetaContactsEnabled && strcmp(cont->proto,g_szMetaModuleName) == 0)
AddSubcontacts(dat,cont,CLCItems_IsShowOfflineGroup(group));
@@ -500,7 +502,7 @@ void cli_SaveStateAndRebuildList(HWND hwnd, ClcData *dat) ClcGroup *group;
ClcContact *contact;
-
+
pcli->pfnHideInfoTip(hwnd, dat);
KillTimer(hwnd, TIMERID_INFOTIP);
KillTimer(hwnd, TIMERID_RENAME);
@@ -518,7 +520,7 @@ void cli_SaveStateAndRebuildList(HWND hwnd, ClcData *dat) else if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP) {
group = group->cl.items[group->scanIndex]->group;
group->scanIndex = 0;
-
+
SavedGroupState_t* p = new SavedGroupState_t;
p->groupId = group->groupId;
p->expanded = group->expanded;
@@ -606,7 +608,7 @@ void cli_SaveStateAndRebuildList(HWND hwnd, ClcData *dat) WORD pdnce___GetStatus(ClcCacheEntry *pdnce)
{
- if ( !pdnce)
+ if ( !pdnce)
return ID_STATUS_OFFLINE;
else
return pdnce->m_cache_nStatus;
@@ -630,7 +632,7 @@ ClcCacheEntry* cliCreateCacheItem( HANDLE hContact ) ClcCacheEntry *p = (ClcCacheEntry *)mir_calloc(sizeof( ClcCacheEntry ));
if (p == NULL)
return NULL;
-
+
p->hContact = hContact;
InvalidateDNCEbyPointer(hContact, p, 0);
p->szSecondLineText = NULL;
@@ -674,8 +676,8 @@ int cliGetGroupContentsCount(ClcGroup *group, int visibleOnly) count += group->cl.count;
continue;
}
- else if ((group->cl.items[group->scanIndex]->type == CLCIT_CONTACT) &&
- (group->cl.items[group->scanIndex]->subcontacts != NULL) &&
+ else if ((group->cl.items[group->scanIndex]->type == CLCIT_CONTACT) &&
+ (group->cl.items[group->scanIndex]->subcontacts != NULL) &&
((group->cl.items[group->scanIndex]->SubExpanded || (!visibleOnly))))
{
count += group->cl.items[group->scanIndex]->SubAllocated;
@@ -760,6 +762,6 @@ int __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szProto, ClcDa }
return (dbHidden | !filterResult | searchResult);
}
-
+
return dbHidden | searchResult;
}
diff --git a/plugins/Clist_modern/src/modern_clcmsgs.cpp b/plugins/Clist_modern/src/modern_clcmsgs.cpp index d31016b09f..ebfb45bc7a 100644 --- a/plugins/Clist_modern/src/modern_clcmsgs.cpp +++ b/plugins/Clist_modern/src/modern_clcmsgs.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -31,7 +32,7 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd,ClcData *dat,UINT msg,WPARAM wPara {
ClcContact *contact;
ClcGroup *group;
-
+
switch(msg) {
case CLM_DELETEITEM:
pcli->pfnDeleteItemFromTree(hwnd, (HANDLE) wParam);
@@ -95,10 +96,10 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd,ClcData *dat,UINT msg,WPARAM wPara dat->fontModernInfo[FONTID_CONTACT_TIME].colour = lParam;
break;
case FONTID_OPENGROUPS:
- dat->fontModernInfo[FONTID_CLOSEDGROUPS].colour = lParam;
+ dat->fontModernInfo[FONTID_CLOSEDGROUPS].colour = lParam;
break;
case FONTID_OPENGROUPCOUNTS:
- dat->fontModernInfo[FONTID_CLOSEDGROUPCOUNTS].colour = lParam;
+ dat->fontModernInfo[FONTID_CLOSEDGROUPCOUNTS].colour = lParam;
break;
}
return 0;
@@ -194,21 +195,21 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd,ClcData *dat,UINT msg,WPARAM wPara else {
index = List_IndexOf((SortedList*)&group->cl,contact->subcontacts);
mainindex = index;
- index += contact->isSubcontact;
- }
-
+ index += contact->isSubcontact;
+ }
+
BYTE k = db_get_b(NULL,"CLC","MetaExpanding",SETTING_METAEXPANDING_DEFAULT);
if (k) {
for (int i=0; i < mainindex; i++)
{
ClcContact *tempCont = group->cl.items[i];
if (tempCont->type == CLCIT_CONTACT && tempCont->SubAllocated && tempCont->SubExpanded)
- index += tempCont->SubAllocated;
+ index += tempCont->SubAllocated;
}
- }
+ }
dat->selection = pcli->pfnGetRowsPriorTo(&dat->list, group, index);
- pcli->pfnEnsureVisible(hwnd, dat, dat->selection, 0);
+ pcli->pfnEnsureVisible(hwnd, dat, dat->selection, 0);
}
return 0;
diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index a782a6167d..05dfb26625 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -1071,7 +1072,7 @@ static INT_PTR CALLBACK DlgProcClistWindowOpts(HWND hwndDlg, UINT msg, WPARAM wP g_hCLUIOptionsWnd = hwndDlg;
CheckDlgButton(hwndDlg, IDC_ONTOP, db_get_b(NULL, "CList", "OnTop", SETTING_ONTOP_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);
{
- //====== Activate/Deactivate Non-Layered items =======
+ //====== Activate/Deactivate Non-Layered items =======
fEnabled = !g_CluiData.fLayered || g_CluiData.fDisableSkinEngine;
EnableWindow(GetDlgItem(hwndDlg, IDC_TOOLWND), fEnabled);
EnableWindow(GetDlgItem(hwndDlg, IDC_MIN2TRAY), fEnabled);
@@ -1086,7 +1087,7 @@ static INT_PTR CALLBACK DlgProcClistWindowOpts(HWND hwndDlg, UINT msg, WPARAM wP EnableWindow(GetDlgItem(hwndDlg, IDC_ROUNDCORNERS), fEnabled);
}
{
- //====== Non-Layered Mode =====
+ //====== Non-Layered Mode =====
CheckDlgButton(hwndDlg, IDC_TOOLWND, db_get_b(NULL, "CList", "ToolWindow", SETTING_TOOLWINDOW_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_MIN2TRAY, db_get_b(NULL, "CList", "Min2Tray", SETTING_MIN2TRAY_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_BORDER, db_get_b(NULL, "CList", "ThinBorder", SETTING_THINBORDER_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);
@@ -1108,7 +1109,7 @@ static INT_PTR CALLBACK DlgProcClistWindowOpts(HWND hwndDlg, UINT msg, WPARAM wP }
CheckDlgButton(hwndDlg, IDC_DROPSHADOW, db_get_b(NULL, "CList", "WindowShadow", SETTING_WINDOWSHADOW_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_ROUNDCORNERS, db_get_b(NULL, "CLC", "RoundCorners", SETTING_ROUNDCORNERS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);
- } //====== End of Non-Layered Mode =====
+ } //====== End of Non-Layered Mode =====
CheckDlgButton(hwndDlg, IDC_FADEINOUT, db_get_b(NULL, "CLUI", "FadeInOut", SETTING_FADEIN_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_ONDESKTOP, db_get_b(NULL, "CList", "OnDesktop", SETTING_ONDESKTOP_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);
@@ -1188,7 +1189,7 @@ static INT_PTR CALLBACK DlgProcClistWindowOpts(HWND hwndDlg, UINT msg, WPARAM wP EnableWindow(GetDlgItem(hwndDlg, IDC_ACTIVEPERC), IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT));
EnableWindow(GetDlgItem(hwndDlg, IDC_INACTIVEPERC), IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT));
}
- else if (LOWORD(wParam) == IDC_LAYERENGINE || LOWORD(wParam) == IDC_DISABLEENGINE) { //====== Activate/Deactivate Non-Layered items =======
+ else if (LOWORD(wParam) == IDC_LAYERENGINE || LOWORD(wParam) == IDC_DISABLEENGINE) { //====== Activate/Deactivate Non-Layered items =======
fEnabled = !(IsWindowEnabled(GetDlgItem(hwndDlg, IDC_LAYERENGINE)) && !IsDlgButtonChecked(hwndDlg, IDC_LAYERENGINE) && !IsDlgButtonChecked(hwndDlg, IDC_DISABLEENGINE));
EnableWindow(GetDlgItem(hwndDlg, IDC_TOOLWND), fEnabled && (IsDlgButtonChecked(hwndDlg, IDC_SHOWCAPTION)) && !(IsDlgButtonChecked(hwndDlg, IDC_NOBORDERWND) || IsDlgButtonChecked(hwndDlg, IDC_BORDER)));
@@ -1272,7 +1273,7 @@ static INT_PTR CALLBACK DlgProcClistWindowOpts(HWND hwndDlg, UINT msg, WPARAM wP SetWindowPos(pcli->hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_ONTOP) ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
db_set_b(NULL, "CLUI", "DragToScroll", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DRAGTOSCROLL));
- { //====== Non-Layered Mode ======
+ { //====== Non-Layered Mode ======
db_set_b(NULL, "CList", "ToolWindow", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TOOLWND));
db_set_b(NULL, "CLUI", "ShowCaption", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWCAPTION));
db_set_b(NULL, "CLUI", "ShowMainMenu", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWMAINMENU));
@@ -1286,7 +1287,7 @@ static INT_PTR CALLBACK DlgProcClistWindowOpts(HWND hwndDlg, UINT msg, WPARAM wP db_set_b(NULL, "CList", "Min2Tray", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_MIN2TRAY));
db_set_b(NULL, "CList", "WindowShadow", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DROPSHADOW));
db_set_b(NULL, "CLC", "RoundCorners", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ROUNDCORNERS));
- } //====== End of Non-Layered Mode ======
+ } //====== End of Non-Layered Mode ======
g_mutex_bChangingMode = TRUE;
if (IsDlgButtonChecked(hwndDlg, IDC_ONDESKTOP)) {
diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp index 180c4b4995..6290654a02 100644 --- a/plugins/Clist_modern/src/modern_clcpaint.cpp +++ b/plugins/Clist_modern/src/modern_clcpaint.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or ( at your option ) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -21,7 +22,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_clc.h"
@@ -96,14 +96,14 @@ const int CLCPaint::MIN_TEXT_WIDTH = 20; const int CLCPaint::BUF2SIZE = 7;
const BYTE CLCPaint::GIM_SELECTED_AFFECT = 1;
-const BYTE CLCPaint::GIM_HOT_AFFECT = 2;
-const BYTE CLCPaint::GIM_TEMP_AFFECT = 4;
+const BYTE CLCPaint::GIM_HOT_AFFECT = 2;
+const BYTE CLCPaint::GIM_TEMP_AFFECT = 4;
const BYTE CLCPaint::GIM_IDLE_AFFECT = 8;
const BYTE CLCPaint::GIM_EXTRAICON_AFFECT = CLCPaint::GIM_SELECTED_AFFECT | CLCPaint::GIM_HOT_AFFECT | CLCPaint::GIM_IDLE_AFFECT | CLCPaint::GIM_TEMP_AFFECT;
const BYTE CLCPaint::GIM_STATUSICON_AFFECT = CLCPaint::GIM_IDLE_AFFECT | CLCPaint::GIM_TEMP_AFFECT;
const BYTE CLCPaint::GIM_AVATAR_AFFECT = CLCPaint::GIM_IDLE_AFFECT | CLCPaint::GIM_TEMP_AFFECT;
-CLCPaint::CLCPaint()
+CLCPaint::CLCPaint()
{
_FillQuickHash();
};
@@ -132,19 +132,19 @@ HFONT CLCPaint::ChangeToFont( HDC hdc, ClcData *dat, int id, int *fontHeight ) if ( !dat)
dat = (ClcData*)GetWindowLongPtr( pcli->hwndContactTree, 0 );
- if ( !dat)
+ if ( !dat)
return NULL;
HFONT res = ( HFONT )SelectObject( hdc, dat->fontModernInfo[id].hFont );
SetTextColor( hdc, dat->fontModernInfo[id].colour );
- if ( fontHeight )
+ if ( fontHeight )
*fontHeight = dat->fontModernInfo[id].fontHeight;
ske_ResetTextEffect( hdc );
if ( dat->hWnd == pcli->hwndContactTree && dat->fontModernInfo[id].effect != 0 )
ske_SelectTextEffect( hdc, dat->fontModernInfo[id].effect-1, dat->fontModernInfo[id].effectColour1, dat->fontModernInfo[id].effectColour2 );
- else
+ else
ske_ResetTextEffect( hdc );
return res;
@@ -171,7 +171,7 @@ int CLCPaint::GetBasicFontID(ClcContact *contact) return FONTID_NOTONLIST;
if (( contact->flags&CONTACTF_INVISTO
&& _GetRealStatus( contact, ID_STATUS_OFFLINE ) != ID_STATUS_INVISIBLE )
- ||
+ ||
( contact->flags&CONTACTF_VISTO
&& _GetRealStatus( contact, ID_STATUS_OFFLINE ) == ID_STATUS_INVISIBLE ))
{
@@ -179,7 +179,7 @@ int CLCPaint::GetBasicFontID(ClcContact *contact) // the contact is in the always invisible and the proto is in any other mode
return contact->flags & CONTACTF_ONLINE ? FONTID_INVIS : FONTID_OFFINVIS;
}
-
+
switch( pdnce___GetStatus( pdnce )) {
case ID_STATUS_OFFLINE: return FONTID_OFFLINE;
case ID_STATUS_AWAY: return FONTID_AWAY;
@@ -257,8 +257,8 @@ void CLCPaint::AddParam( MODERNMASK *mpModernMask, DWORD dwParamHash, const cha BOOL CLCPaint::CheckMiniMode( ClcData *dat, BOOL selected, BOOL hot )
{
- if (( !dat->bCompactMode /* not mini*/ )
- || (( dat->bCompactMode&0x01 ) && selected /*mini on selected*/ )
+ if (( !dat->bCompactMode /* not mini*/ )
+ || (( dat->bCompactMode&0x01 ) && selected /*mini on selected*/ )
/* || ( TRUE && hot )*/ ) return FALSE;
return TRUE;
}
@@ -349,14 +349,14 @@ int CLCPaint::_GetGeneralisedStatus() int status = ID_STATUS_OFFLINE;
int statusOnlineness = 0;
- for ( int i=0; i < pcli->hClcProtoCount; i++ )
+ for ( int i=0; i < pcli->hClcProtoCount; i++ )
{
int thisStatus = pcli->clcProto[i].dwStatus;
if ( thisStatus == ID_STATUS_INVISIBLE )
return ID_STATUS_INVISIBLE;
int thisOnlineness = _GetStatusOnlineness( thisStatus );
- if ( thisOnlineness > statusOnlineness )
+ if ( thisOnlineness > statusOnlineness )
{
status = thisStatus;
statusOnlineness = thisOnlineness;
@@ -366,8 +366,8 @@ int CLCPaint::_GetGeneralisedStatus() }
int CLCPaint::_GetRealStatus( ClcContact *pContact, int nStatus )
-{
- if ( !pContact->proto )
+{
+ if ( !pContact->proto )
return nStatus;
for ( int i=0; i < pcli->hClcProtoCount; i++ )
@@ -513,7 +513,7 @@ void CLCPaint::_DrawTextSmiley( HDC hdcMem, RECT *free_rc, SIZE * text_size, TC {
text_rc.top += ( row_height - fac_height ) >> 1;
- ske_DrawIconEx(hdcMem, text_rc.left, text_rc.top, piece->smiley,
+ ske_DrawIconEx(hdcMem, text_rc.left, text_rc.top, piece->smiley,
fac_width, fac_height, 0, NULL, DI_NORMAL|(( factor < 1 )?128:0 )); //TO DO enchance drawing quality
}
else
@@ -708,8 +708,8 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact if ( Drawing->type == CLCIT_CONTACT )
pdnce = pcli->pfnGetCacheEntry( Drawing->hContact );
- if ( Drawing->type == CLCIT_GROUP &&
- Drawing->group->parent->groupId == 0 &&
+ if ( Drawing->type == CLCIT_GROUP &&
+ Drawing->group->parent->groupId == 0 &&
Drawing->group->parent->cl.items[0] != Drawing )
{
dg = dat->row_before_group_space;
@@ -760,7 +760,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact mode = ILD_NORMAL;
}
- if ( Drawing->type == CLCIT_CONTACT && dat->showIdle && ( Drawing->flags&CONTACTF_IDLE ) &&
+ if ( Drawing->type == CLCIT_CONTACT && dat->showIdle && ( Drawing->flags&CONTACTF_IDLE ) &&
_GetRealStatus( Drawing, ID_STATUS_OFFLINE ) != ID_STATUS_OFFLINE )
{
mode = ILD_SELECTED;
@@ -818,7 +818,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact Drawing->pos_extra[iImage] = rc;
Drawing->pos_extra[iImage] = rc;
if (Drawing->iExtraImage[iImage] != EMPTY_EXTRA_ICON)
- ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[iImage], hdcMem,
+ ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[iImage], hdcMem,
rc.left, rc.top, 0, 0, CLR_NONE, colourFg, mode );
}
fr_rc.right -= x;
@@ -836,7 +836,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact ChangeToFont(hdcMem, dat, GetBasicFontID( Drawing ), NULL );
// Get text size
- GetTextSize( &text_size, hdcMem, fr_rc, Drawing->szText, Drawing->ssText.plText, uTextFormat,
+ GetTextSize( &text_size, hdcMem, fr_rc, Drawing->szText, Drawing->ssText.plText, uTextFormat,
dat->text_resize_smileys ? 0 : Drawing->ssText.iMaxSmileyHeight );
// counters
if ( Drawing->type == CLCIT_GROUP && InClistWindow )
@@ -913,7 +913,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact _SetHotTrackColour(hdcMem, dat );
if ( dat->text_rtl != 0 ) _RTLRect( &nameRect, free_row_rc.right, dx );
_DrawTextSmiley(hdcMem, &nameRect, &text_size, Drawing->szText, 0, lstrlen( Drawing->szText ), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys );
-
+
if (selected && !dat->filterSearch) {
SetTextColor(hdcMem, dat->quickSearchColour );
_DrawTextSmiley(hdcMem, &nameRect, &text_size, Drawing->szText, 0, lstrlen( Drawing->szText ), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys );
@@ -997,7 +997,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact TCHAR *lowered = CharLowerW(NEWTSTR_ALLOCA(Drawing->szText));
TCHAR *p1 = _tcsstr(lowered, dat->szQuickSearch);
if (p1)
- idx = int(p1 - lowered);
+ idx = int(p1 - lowered);
}
SetTextColor(hdcMem, dat->quickSearchColour );
_DrawTextSmiley(hdcMem, &text_rect, &text_size, Drawing->szText, idx, lstrlen( dat->szQuickSearch ), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys );
@@ -1086,7 +1086,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact TCHAR *lowered = CharLowerW(NEWTSTR_ALLOCA(Drawing->szText));
TCHAR *p1 = _tcsstr(lowered, dat->szQuickSearch);
if (p1)
- idx = int(p1 - lowered);
+ idx = int(p1 - lowered);
}
SetTextColor(hdcMem, dat->quickSearchColour );
_DrawTextSmiley(hdcMem, &p_rect, &text_size, Drawing->szText, idx, lstrlen( dat->szQuickSearch ), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys );
@@ -1258,7 +1258,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact if (( Drawing->type == CLCIT_GROUP && !dat->row_hide_group_icon )
|| ( Drawing->type == CLCIT_CONTACT && Drawing->iImage != -1
&& !( dat->icon_hide_on_avatar && dat->avatars_show
- && (( dat->use_avatar_service && Drawing->avatar_data != NULL ) ||
+ && (( dat->use_avatar_service && Drawing->avatar_data != NULL ) ||
( !dat->use_avatar_service && Drawing->avatar_pos != AVATAR_POS_DONT_HAVE )
)
&& !Drawing->image_is_special )))
@@ -1294,7 +1294,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact mode = ILD_NORMAL;
}
- if ( Drawing->type == CLCIT_CONTACT && dat->showIdle && ( Drawing->flags&CONTACTF_IDLE ) &&
+ if ( Drawing->type == CLCIT_CONTACT && dat->showIdle && ( Drawing->flags&CONTACTF_IDLE ) &&
_GetRealStatus( Drawing, ID_STATUS_OFFLINE ) != ID_STATUS_OFFLINE )
{
mode = ILD_SELECTED;
@@ -1315,7 +1315,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact blendmode = 255;
else if ( Drawing->type == CLCIT_CONTACT && Drawing->flags&CONTACTF_NOTONLIST )
blendmode = 128;
- if ( Drawing->type == CLCIT_CONTACT && dat->showIdle && ( Drawing->flags&CONTACTF_IDLE ) &&
+ if ( Drawing->type == CLCIT_CONTACT && dat->showIdle && ( Drawing->flags&CONTACTF_IDLE ) &&
_GetRealStatus( Drawing, ID_STATUS_OFFLINE ) != ID_STATUS_OFFLINE )
blendmode = 128;
if ( !hasAvatar ) //if no avatar then paint icon image
@@ -1343,7 +1343,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact mode = ILD_NORMAL;
}
- if ( Drawing->type == CLCIT_CONTACT && dat->showIdle && ( Drawing->flags&CONTACTF_IDLE ) &&
+ if ( Drawing->type == CLCIT_CONTACT && dat->showIdle && ( Drawing->flags&CONTACTF_IDLE ) &&
_GetRealStatus( Drawing, ID_STATUS_OFFLINE ) != ID_STATUS_OFFLINE )
{
mode = ILD_SELECTED;
@@ -1442,13 +1442,13 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact {
UINT a = blendmode;
a = ( a << 24 );
- ske_ImageList_DrawEx( hAvatarOverlays, g_pAvatarOverlayIcons[GetContactCachedStatus( Drawing->hContact ) - ID_STATUS_OFFLINE].listID,
- hdcMem,
- p_rect.left, p_rect.top, ICON_HEIGHT, ICON_HEIGHT,
- CLR_NONE, CLR_NONE,
+ ske_ImageList_DrawEx( hAvatarOverlays, g_pAvatarOverlayIcons[GetContactCachedStatus( Drawing->hContact ) - ID_STATUS_OFFLINE].listID,
+ hdcMem,
+ p_rect.left, p_rect.top, ICON_HEIGHT, ICON_HEIGHT,
+ CLR_NONE, CLR_NONE,
( blendmode == 255 )?ILD_NORMAL:( blendmode == 128 )?ILD_BLEND50:ILD_BLEND25 );
- //ske_DrawIconEx(hdcMem, p_rect.left, p_rect.top, g_pAvatarOverlayIcons[GetContactCachedStatus( Drawing->hContact ) - ID_STATUS_OFFLINE].icon,
+ //ske_DrawIconEx(hdcMem, p_rect.left, p_rect.top, g_pAvatarOverlayIcons[GetContactCachedStatus( Drawing->hContact ) - ID_STATUS_OFFLINE].icon,
// ICON_HEIGHT, ICON_HEIGHT, 0, NULL, DI_NORMAL|a );
break;
}
@@ -1456,15 +1456,15 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact {
int item = pcli->pfnIconFromStatusMode(Drawing->proto, Drawing->proto == NULL ? ID_STATUS_OFFLINE : GetContactCachedStatus(Drawing->hContact), Drawing->hContact);
if (item != -1)
- _DrawStatusIcon(Drawing, dat, item, hdcMem,
- p_rect.left, p_rect.top, ICON_HEIGHT, ICON_HEIGHT,
+ _DrawStatusIcon(Drawing, dat, item, hdcMem,
+ p_rect.left, p_rect.top, ICON_HEIGHT, ICON_HEIGHT,
CLR_NONE, CLR_NONE, ( blendmode == 255 )?ILD_NORMAL:( blendmode == 128 )?ILD_BLEND50:ILD_BLEND25 );
}
break;
case SETTING_AVATAR_OVERLAY_TYPE_CONTACT:
if ( Drawing->iImage != -1 )
- _DrawStatusIcon( Drawing, dat, Drawing->iImage, hdcMem,
- p_rect.left, p_rect.top, ICON_HEIGHT, ICON_HEIGHT,
+ _DrawStatusIcon( Drawing, dat, Drawing->iImage, hdcMem,
+ p_rect.left, p_rect.top, ICON_HEIGHT, ICON_HEIGHT,
CLR_NONE, CLR_NONE, ( blendmode == 255 )?ILD_NORMAL:( blendmode == 128 )?ILD_BLEND50:ILD_BLEND25 );
break;
}
@@ -1476,7 +1476,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact case TC_EXTRA:
{
- if ( Drawing->type == CLCIT_CONTACT &&
+ if ( Drawing->type == CLCIT_CONTACT &&
( !Drawing->isSubcontact || dat->dbbMetaHideExtra == 0 && dat->extraColumnsCount > 0 ))
{
int BlendedInActiveState = dat->dbbBlendInActiveState;
@@ -1516,7 +1516,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact if ( dat->text_rtl != 0 ) _RTLRect( &rc, free_row_rc.right, 0 );
Drawing->pos_extra[iImage] = rc;
if (Drawing->iExtraImage[iImage] != EMPTY_EXTRA_ICON)
- ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[iImage], hdcMem,
+ ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[iImage], hdcMem,
rc.left, rc.top, 0, 0, CLR_NONE, colourFg, mode );
}
}
@@ -1532,7 +1532,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact case TC_EXTRA8:
case TC_EXTRA9:
{
- if ( Drawing->type == CLCIT_CONTACT &&
+ if ( Drawing->type == CLCIT_CONTACT &&
( !Drawing->isSubcontact || dat->dbbMetaHideExtra == 0 && dat->extraColumnsCount > 0 ))
{
int eNum = gl_RowTabAccess[i]->type-TC_EXTRA1;
@@ -1560,7 +1560,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact if ( dat->text_rtl != 0 ) _RTLRect( &p_rect, free_row_rc.right, 0 );
Drawing->pos_extra[eNum] = p_rect;
if (Drawing->iExtraImage[eNum] != EMPTY_EXTRA_ICON)
- ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[eNum], hdcMem,
+ ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[eNum], hdcMem,
p_rect.left, p_rect.top, 0, 0, CLR_NONE, colourFg, mode );
}
}
@@ -1591,12 +1591,12 @@ void CLCPaint::_DrawStatusIcon( ClcContact *Drawing, ClcData *dat, int iImage, H {
if ( Drawing->type != CLCIT_CONTACT )
{
- ske_ImageList_DrawEx( g_himlCListClc, LOWORD(iImage), hdcMem,
+ ske_ImageList_DrawEx( g_himlCListClc, LOWORD(iImage), hdcMem,
x, y, cx, cy, colorbg, colorfg, mode );
}
else if ( Drawing->image_is_special )
{
- ske_ImageList_DrawEx( g_himlCListClc, LOWORD(iImage), hdcMem,
+ ske_ImageList_DrawEx( g_himlCListClc, LOWORD(iImage), hdcMem,
x, y, cx, cy, colorbg, colorfg, mode );
}
else if ( iImage != -1 && HIWORD(iImage) && dat->drawOverlayedStatus )
@@ -1606,18 +1606,18 @@ void CLCPaint::_DrawStatusIcon( ClcContact *Drawing, ClcData *dat, int iImage, H else if (status > ID_STATUS_OUTTOLUNCH) status = ID_STATUS_ONLINE;
ske_ImageList_DrawEx(g_himlCListClc, HIWORD(iImage), hdcMem, x, y, cx, cy, colorbg, colorfg, mode);
if (dat->drawOverlayedStatus & 2) //draw overlay
- ske_ImageList_DrawEx( hAvatarOverlays, g_pStatusOverlayIcons[status-ID_STATUS_OFFLINE].listID, hdcMem,
+ ske_ImageList_DrawEx( hAvatarOverlays, g_pStatusOverlayIcons[status-ID_STATUS_OFFLINE].listID, hdcMem,
x, y, cx, cy, colorbg, colorfg, mode );
}
else
{
- ske_ImageList_DrawEx( g_himlCListClc, LOWORD(iImage), hdcMem,
+ ske_ImageList_DrawEx( g_himlCListClc, LOWORD(iImage), hdcMem,
x, y, cx, cy, colorbg, colorfg, mode );
}
}
BOOL CLCPaint::_DrawNonEnginedBackground( HWND hwnd, HDC hdcMem, RECT *rcPaint, RECT clRect, ClcData *dat )
-{
+{
if (!dat->hBmpBackground)
return FALSE;
@@ -1632,7 +1632,7 @@ BOOL CLCPaint::_DrawNonEnginedBackground( HWND hwnd, HDC hdcMem, RECT *rcPaint, int maxx = dat->backgroundBmpUse&CLBF_TILEH?clRect.right:1;
int maxy = dat->backgroundBmpUse&CLBF_TILEV?maxy = rcPaint->bottom:y+1;
int destw, desth;
-
+
switch( dat->backgroundBmpUse&CLBM_TYPE ) {
case CLB_STRETCH:
if ( dat->backgroundBmpUse&CLBF_PROPORTIONAL ) {
@@ -1662,7 +1662,7 @@ BOOL CLCPaint::_DrawNonEnginedBackground( HWND hwnd, HDC hdcMem, RECT *rcPaint, if ( dat->backgroundBmpUse&CLBF_TILEVTOROWHEIGHT )
{
desth = dat->row_min_heigh;
- }
+ }
}
break;
@@ -1684,7 +1684,7 @@ BOOL CLCPaint::_DrawNonEnginedBackground( HWND hwnd, HDC hdcMem, RECT *rcPaint, if ( dat->backgroundBmpUse&CLBF_TILEVTOROWHEIGHT )
{
desth = dat->row_min_heigh;
- }
+ }
break;
}
@@ -1720,7 +1720,7 @@ int CLCPaint::_DetermineDrawMode( HWND hWnd, ClcData *dat ) paintMode |= DM_GRAY;
if ( lStyle&CLS_GREYALTERNATE )
- paintMode |= DM_GREYALTERNATE;
+ paintMode |= DM_GREYALTERNATE;
return paintMode;
}
@@ -1761,9 +1761,9 @@ void CLCPaint::_PreparePaintContext( HWND hWnd, ClcData *dat, HDC hdc, int paint int gValue = GetRValue( pc.tmpbkcolour ) + gDelta;
int bValue = GetRValue( pc.tmpbkcolour ) + bDelta;
- BYTE brValue = ( rValue >255) ? 255 : rValue < 0 ? 0 : (BYTE)rValue;
- BYTE bgValue = ( gValue >255) ? 255 : gValue < 0 ? 0 : (BYTE)gValue;
- BYTE bbValue = ( bValue >255) ? 255 : bValue < 0 ? 0 : (BYTE)bValue;
+ BYTE brValue = ( rValue >255) ? 255 : rValue < 0 ? 0 : (BYTE)rValue;
+ BYTE bgValue = ( gValue >255) ? 255 : gValue < 0 ? 0 : (BYTE)gValue;
+ BYTE bbValue = ( bValue >255) ? 255 : bValue < 0 ? 0 : (BYTE)bValue;
pc.hBrushAlternateGrey = CreateSolidBrush( GetNearestColor( pc.hdcMem, RGB( brValue, bgValue, bbValue )));
}
@@ -1773,7 +1773,7 @@ void CLCPaint::_PreparePaintContext( HWND hWnd, ClcData *dat, HDC hdc, int paint SetStretchBltMode(pc.hdcMem, HALFTONE);
POINT org;
- GetBrushOrgEx( pc.hdcMem, &org );
+ GetBrushOrgEx( pc.hdcMem, &org );
SetBrushOrgEx( pc.hdcMem, org.x, org.y, NULL );
}
@@ -1792,7 +1792,7 @@ void CLCPaint::_DrawBackground( HWND hWnd, ClcData *dat, HDC hdc, int paintMode, HBRUSH hBrush = CreateSolidBrush( pc.tmpbkcolour );
FillRect( pc.hdcMem, rcPaint, hBrush );
DeleteObject( hBrush );
- }
+ }
}
else {
if ( paintMode&DM_NON_LAYERED )
@@ -1829,7 +1829,7 @@ void CLCPaint::_DrawLines( HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT }
}
- line_num++;
+ line_num++;
// Draw line, if needed
if ( y > rcPaint->top - dat->row_heights[line_num] )
@@ -1930,8 +1930,8 @@ void CLCPaint::_DrawLines( HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT if ( selected || hottrack )
{
RECT mrc = row_rc;
- if ( Drawing->type == CLCIT_GROUP &&
- Drawing->group->parent->groupId == 0 &&
+ if ( Drawing->type == CLCIT_GROUP &&
+ Drawing->group->parent->groupId == 0 &&
Drawing->group->parent->cl.items[0] != Drawing )
{
mrc.top += dat->row_before_group_space;
@@ -1955,10 +1955,10 @@ void CLCPaint::_DrawLines( HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT }
else
- {
+ {
int checkboxWidth;
- if (( lStyle&CLS_CHECKBOXES && Drawing->type == CLCIT_CONTACT ) ||
- ( lStyle&CLS_GROUPCHECKBOXES && Drawing->type == CLCIT_GROUP ) ||
+ if (( lStyle&CLS_CHECKBOXES && Drawing->type == CLCIT_CONTACT ) ||
+ ( lStyle&CLS_GROUPCHECKBOXES && Drawing->type == CLCIT_GROUP ) ||
( Drawing->type == CLCIT_INFO && Drawing->flags&CLCIIF_CHECKBOX ))
checkboxWidth = dat->checkboxSize+2;
else checkboxWidth = 0;
@@ -1967,14 +1967,14 @@ void CLCPaint::_DrawLines( HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT switch ( dat->HiLightMode )
{
case 0:
- case 1:
+ case 1:
{
int i = y;
int row_height = row_rc.bottom-row_rc.top;
for ( i = y; i < y+row_height; i += max( dat->row_min_heigh, 1 ))
{
- ImageList_DrawEx( dat->himlHighlight, 0, pc.hdcMem, 0, i, clRect.right,
- min( y+row_height-i, max( dat->row_min_heigh, 1 )), CLR_NONE, CLR_NONE,
+ ImageList_DrawEx( dat->himlHighlight, 0, pc.hdcMem, 0, i, clRect.right,
+ min( y+row_height-i, max( dat->row_min_heigh, 1 )), CLR_NONE, CLR_NONE,
dat->exStyle&CLS_EX_NOTRANSLUCENTSEL?ILD_NORMAL:ILD_BLEND25 );
}
SetTextColor( pc.hdcMem, paintMode&DM_CONTROL ? GetSysColor( COLOR_HIGHLIGHTTEXT ) : dat->selTextColour );
@@ -1987,8 +1987,8 @@ void CLCPaint::_DrawLines( HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT int row_height = row_rc.bottom-row_rc.top-1;
for ( i = y+1; i < y+row_height; i += max( dat->row_min_heigh, 1 ))
{
- ImageList_DrawEx( dat->himlHighlight, 0, pc.hdcMem, 1, i, clRect.right-2,
- min( y+row_height-i, max( dat->row_min_heigh, 1 )), CLR_NONE, CLR_NONE,
+ ImageList_DrawEx( dat->himlHighlight, 0, pc.hdcMem, 1, i, clRect.right-2,
+ min( y+row_height-i, max( dat->row_min_heigh, 1 )), CLR_NONE, CLR_NONE,
dat->exStyle&CLS_EX_NOTRANSLUCENTSEL?ILD_NORMAL:ILD_BLEND25 );
}
SetTextColor( pc.hdcMem, paintMode&DM_CONTROL ? GetSysColor( COLOR_HIGHLIGHTTEXT ) : dat->selTextColour );
@@ -1999,8 +1999,8 @@ void CLCPaint::_DrawLines( HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT }
//**** Checkboxes
- if (( lStyle&CLS_CHECKBOXES && Drawing->type == CLCIT_CONTACT ) ||
- ( lStyle&CLS_GROUPCHECKBOXES && Drawing->type == CLCIT_GROUP ) ||
+ if (( lStyle&CLS_CHECKBOXES && Drawing->type == CLCIT_CONTACT ) ||
+ ( lStyle&CLS_GROUPCHECKBOXES && Drawing->type == CLCIT_GROUP ) ||
( Drawing->type == CLCIT_INFO && Drawing->flags&CLCIIF_CHECKBOX ))
{
//RECT rc;
@@ -2030,8 +2030,8 @@ void CLCPaint::_DrawLines( HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT mpRequest->pl_Params[1].dwValueHash = mod_CalcHash("Ovl");
{
RECT mrc = row_rc;
- if ( Drawing->type == CLCIT_GROUP &&
- Drawing->group->parent->groupId == 0 &&
+ if ( Drawing->type == CLCIT_GROUP &&
+ Drawing->group->parent->groupId == 0 &&
Drawing->group->parent->cl.items[0] != Drawing )
{
mrc.top += dat->row_before_group_space;
@@ -2172,10 +2172,10 @@ void CLCPaint::_PaintClc( HWND hwnd, ClcData *dat, HDC hdc, RECT *_rcPaint ) _DrawLines( hwnd, dat, hdc, paintMode, rcPaint, clRect, pc );
//insertion mark
- if ( dat->iInsertionMark != -1 )
+ if ( dat->iInsertionMark != -1 )
_DrawInsertionMark( dat, clRect, pc );
- // BitBlt from memory to destination
+ // BitBlt from memory to destination
_CopyPaintToDest( hwnd, dat, hdc, paintMode, rcPaint, clRect, pc );
// Free
@@ -2243,7 +2243,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *D RECT rc;
int max_width;
int width;
- int height;
+ int height;
BOOL miniMode;
if ( !dat->avatars_show || Drawing->type != CLCIT_CONTACT )
break;
@@ -2267,11 +2267,11 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *D RECT rc;
// Make rectangle
- rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos,
+ rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos,
left, dat->iconXSpace, max_width, ICON_HEIGHT, HORIZONTAL_SPACE );
if ( rc.left < rc.right )
- {
+ {
/* center icon in avatar place */
if ( rc.right-rc.left>16 ) rc.left += (( ( rc.right-rc.left )-16 )>>1 );
if ( rc.bottom-rc.top>16 ) rc.top += (( ( rc.bottom-rc.top )-16 )>>1 );
@@ -2286,12 +2286,12 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *D if (( left && !dat->row_align_left_items_to_left ) || ( !left && !dat->row_align_right_items_to_right ))
{
// Make rectangle
- rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos,
+ rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos,
left, max_width, max_width, dat->avatars_maxheight_size, HORIZONTAL_SPACE );
// Store position
//StoreItemPos( Drawing, CIT_AVATAR, &rc );
- //Drawing->pos_avatar = rc;
+ //Drawing->pos_avatar = rc;
}
}
break;
@@ -2310,7 +2310,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *D }
// Make rectangle
- rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos,
+ rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos,
left, width, max_width, height, HORIZONTAL_SPACE );
rc.top = max( free_row_rc.top, rc.top );
@@ -2327,7 +2327,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *D {
RECT rc;
int iImage = -1;
- BOOL has_avatar = (( dat->use_avatar_service && Drawing->avatar_data != NULL ) ||
+ BOOL has_avatar = (( dat->use_avatar_service && Drawing->avatar_data != NULL ) ||
( !dat->use_avatar_service && Drawing->avatar_pos != AVATAR_POS_DONT_HAVE ))
&& !( CheckMiniMode( dat, selected, hottrack ));
@@ -2340,7 +2340,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *D // Don't have to draw, but has to keep the empty space?
if (( left && !dat->row_align_left_items_to_left ) || ( !left && !dat->row_align_right_items_to_right ))
{
- rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos,
+ rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos,
left, dat->iconXSpace, dat->iconXSpace, ICON_HEIGHT, HORIZONTAL_SPACE );
if ( rc.left < rc.right ) {
@@ -2353,8 +2353,8 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *D if ( Drawing->type == CLCIT_CONTACT
&& dat->icon_hide_on_avatar
&& dat->icon_draw_on_avatar_space
- && ( !Drawing->image_is_special || !has_avatar ||
- (
+ && ( !Drawing->image_is_special || !has_avatar ||
+ (
dat->avatars_draw_overlay
&& dat->avatars_maxheight_size >= ICON_HEIGHT + (dat->avatars_draw_border ? 2 : 0)
&& GetContactCachedStatus(Drawing->hContact) - ID_STATUS_OFFLINE < SIZEOF(g_pAvatarOverlayIcons)
@@ -2376,7 +2376,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *D if ( iImage != -1 )
{
// Make rectangle
- rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos,
+ rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos,
left, dat->iconXSpace, dat->iconXSpace, ICON_HEIGHT, HORIZONTAL_SPACE );
if ( rc.left < rc.right )
@@ -2408,7 +2408,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *D text_size.cx = rc.right - rc.left;
// Get rc
- rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos, left,
+ rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos, left,
text_size.cx, text_size.cx, text_size.cy, HORIZONTAL_SPACE );
if ( rc.left < rc.right )
@@ -2444,7 +2444,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *D for ( iImage = dat->extraColumnsCount-1 ; iImage >= 0 ; iImage-- ) {
if ( Drawing->iExtraImage[iImage] != EMPTY_EXTRA_ICON || !dat->MetaIgnoreEmptyExtra ) {
- rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos,
+ rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos,
left, dat->extraColumnSpacing, dat->extraColumnSpacing, ICON_HEIGHT, 0 );
if (rc.left < rc.right) {
// Store position
@@ -2457,7 +2457,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *D // Add extra space
if ( count )
{
- _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos,
+ _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos,
left, HORIZONTAL_SPACE, HORIZONTAL_SPACE, ICON_HEIGHT, 0 );
}
}
@@ -2489,7 +2489,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *D ChangeToFont(hdcMem, dat, GetBasicFontID( Drawing ), NULL );
// Get text size
- GetTextSize( &text_size, hdcMem, free_row_rc, Drawing->szText, Drawing->ssText.plText, uTextFormat,
+ GetTextSize( &text_size, hdcMem, free_row_rc, Drawing->szText, Drawing->ssText.plText, uTextFormat,
dat->text_resize_smileys ? 0 : Drawing->ssText.iMaxSmileyHeight );
// Get rect
@@ -2610,7 +2610,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *D ChangeToFont(hdcMem, dat, FONTID_SECONDLINE, NULL );
// Get sizes
- GetTextSize( &second_line_text_size, hdcMem, free_row_rc, pdnce->szSecondLineText, pdnce->ssSecondLine.plText,
+ GetTextSize( &second_line_text_size, hdcMem, free_row_rc, pdnce->szSecondLineText, pdnce->ssSecondLine.plText,
uTextFormat, dat->text_resize_smileys ? 0 : pdnce->ssSecondLine.iMaxSmileyHeight );
// Get rect
@@ -2646,7 +2646,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *D ChangeToFont(hdcMem, dat, FONTID_THIRDLINE, NULL );
// Get sizes
- GetTextSize( &third_line_text_size, hdcMem, free_row_rc, pdnce->szThirdLineText, pdnce->ssThirdLine.plText,
+ GetTextSize( &third_line_text_size, hdcMem, free_row_rc, pdnce->szThirdLineText, pdnce->ssThirdLine.plText,
uTextFormat, dat->text_resize_smileys ? 0 : pdnce->ssThirdLine.iMaxSmileyHeight );
// Get rect
@@ -2864,17 +2864,17 @@ void CLCPaint::_GetBlendMode( IN ClcData *dat, IN ClcContact *Drawing, IN BOOL s colourFg = dat->selBkColour;
mode = ILD_NORMAL;
}
- if ( Drawing->type == CLCIT_CONTACT && dat->showIdle && ( Drawing->flags&CONTACTF_IDLE ) &&
- _GetRealStatus( Drawing, ID_STATUS_OFFLINE ) != ID_STATUS_OFFLINE &&
+ if ( Drawing->type == CLCIT_CONTACT && dat->showIdle && ( Drawing->flags&CONTACTF_IDLE ) &&
+ _GetRealStatus( Drawing, ID_STATUS_OFFLINE ) != ID_STATUS_OFFLINE &&
( bFlag&GIM_IDLE_AFFECT )
- )
+ )
mode = ILD_SELECTED;
if ( OutColourFg ) *OutColourFg = colourFg;
- if ( OutMode )
+ if ( OutMode )
{
if ( OutColourFg ) *OutMode = mode; //return ILD_MODE if color requested
- else *OutMode =
- ( mode == ILD_BLEND50 )?128 :
+ else *OutMode =
+ ( mode == ILD_BLEND50 )?128 :
( mode == ILD_BLEND25 )?64 :
255; //return alpha otherwise
}
@@ -2904,12 +2904,12 @@ void CLCPaint::_DrawContactAvatar( HDC hdcMem, ClcData *dat, ClcContact *Drawing _GetBlendMode( dat, Drawing, selected, hottrack, GIM_AVATAR_AFFECT, NULL, &blendmode );
AniAva_SetAvatarPos( Drawing->hContact, prcItem, overlayIdx, blendmode );
AniAva_RenderAvatar( Drawing->hContact, hdcMem, prcItem );
- }
+ }
else if ( Drawing->avatar_pos>AVATAR_POS_DONT_HAVE )
{
int round_radius = 0;
HRGN rgn;
- int blendmode = 255;
+ int blendmode = 255;
_GetBlendMode( dat, Drawing, selected, hottrack, GIM_AVATAR_AFFECT, NULL, &blendmode );
@@ -2966,25 +2966,25 @@ void CLCPaint::_DrawContactAvatar( HDC hdcMem, ClcData *dat, ClcContact *Drawing }
switch( dat->avatars_overlay_type ) {
case SETTING_AVATAR_OVERLAY_TYPE_NORMAL:
- ske_ImageList_DrawEx( hAvatarOverlays, g_pAvatarOverlayIcons[GetContactCachedStatus( Drawing->hContact ) - ID_STATUS_OFFLINE].listID,
- hdcMem,
- ptOverlay.x, ptOverlay.y, ICON_HEIGHT, ICON_HEIGHT,
- CLR_NONE, CLR_NONE,
+ ske_ImageList_DrawEx( hAvatarOverlays, g_pAvatarOverlayIcons[GetContactCachedStatus( Drawing->hContact ) - ID_STATUS_OFFLINE].listID,
+ hdcMem,
+ ptOverlay.x, ptOverlay.y, ICON_HEIGHT, ICON_HEIGHT,
+ CLR_NONE, CLR_NONE,
( blendmode == 255 )?ILD_NORMAL:( blendmode == 128 )?ILD_BLEND50:ILD_BLEND25 );
break;
case SETTING_AVATAR_OVERLAY_TYPE_PROTOCOL:
{
int item = pcli->pfnIconFromStatusMode(Drawing->proto, Drawing->proto == NULL ? ID_STATUS_OFFLINE : GetContactCachedStatus(Drawing->hContact), Drawing->hContact);
if ( item != -1 )
- _DrawStatusIcon( Drawing, dat, item, hdcMem,
- ptOverlay.x, ptOverlay.y, ICON_HEIGHT, ICON_HEIGHT,
+ _DrawStatusIcon( Drawing, dat, item, hdcMem,
+ ptOverlay.x, ptOverlay.y, ICON_HEIGHT, ICON_HEIGHT,
CLR_NONE, CLR_NONE, ( blendmode == 255 )?ILD_NORMAL:( blendmode == 128 )?ILD_BLEND50:ILD_BLEND25 );
}
break;
case SETTING_AVATAR_OVERLAY_TYPE_CONTACT:
if ( Drawing->iImage != -1 )
- _DrawStatusIcon( Drawing, dat, Drawing->iImage, hdcMem,
- ptOverlay.x, ptOverlay.y, ICON_HEIGHT, ICON_HEIGHT,
+ _DrawStatusIcon( Drawing, dat, Drawing->iImage, hdcMem,
+ ptOverlay.x, ptOverlay.y, ICON_HEIGHT, ICON_HEIGHT,
CLR_NONE, CLR_NONE, ( blendmode == 255 )?ILD_NORMAL:( blendmode == 128 )?ILD_BLEND50:ILD_BLEND25 );
break;
}
@@ -3011,8 +3011,8 @@ void CLCPaint::_DrawContactIcon( HDC hdcMem, ClcData *dat, ClcContact *Drawing, COLORREF colourFg;
int mode;
_GetBlendMode( dat, Drawing, selected, hottrack, GIM_STATUSICON_AFFECT, &colourFg, &mode );
- _DrawStatusIcon( Drawing, dat, iImage, hdcMem,
- prcItem->left, prcItem->top,
+ _DrawStatusIcon( Drawing, dat, iImage, hdcMem,
+ prcItem->left, prcItem->top,
0, 0, CLR_NONE, colourFg, mode );
}
}
@@ -3040,7 +3040,7 @@ void CLCPaint::_DrawContactText( HDC hdcMem, ClcData *dat, ClcContact *Drawing, text_size.cy = _rcHeight( prcItem );
uTextFormat |= DT_VCENTER;
//get font
- _DrawTextSmiley(hdcMem, prcItem, &text_size, Drawing->szText, 0, -1, Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys );
+ _DrawTextSmiley(hdcMem, prcItem, &text_size, Drawing->szText, 0, -1, Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys );
if ( (dat->filterSearch || selected) && dat->szQuickSearch[0] != '\0' )
{
int idx = 0;
@@ -3049,7 +3049,7 @@ void CLCPaint::_DrawContactText( HDC hdcMem, ClcData *dat, ClcContact *Drawing, TCHAR *lowered = CharLowerW(NEWTSTR_ALLOCA(Drawing->szText));
TCHAR *p1 = _tcsstr(lowered, dat->szQuickSearch);
if (p1)
- idx = int(p1 - lowered);
+ idx = int(p1 - lowered);
}
SetTextColor(hdcMem, dat->quickSearchColour );
_DrawTextSmiley(hdcMem, prcItem, &text_size, Drawing->szText, idx, lstrlen( dat->szQuickSearch ), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys );
@@ -3063,7 +3063,7 @@ void CLCPaint::_DrawContactText( HDC hdcMem, ClcData *dat, ClcContact *Drawing, text_rc.left = min( text_rc.left, prcItem->left );
}
void CLCPaint::_DrawContactSubText( HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT *prcItem, UINT uTextFormat, BYTE itemType )
-{
+{
if ( Drawing->type == CLCIT_GROUP )
{
char * szCounts = pcli->pfnGetGroupCountsText( dat, Drawing );
@@ -3078,7 +3078,7 @@ void CLCPaint::_DrawContactSubText( HDC hdcMem, ClcData *dat, ClcContact *Drawin _SetHotTrackColour(hdcMem, dat );
ske_DrawTextA(hdcMem, szCounts, -1, prcItem, uTextFormat );
ske_ResetTextEffect(hdcMem );
- }
+ }
}
else if ( Drawing->type == CLCIT_CONTACT )
{
@@ -3093,9 +3093,9 @@ void CLCPaint::_DrawContactSubText( HDC hdcMem, ClcData *dat, ClcContact *Drawin _SetHotTrackColour(hdcMem, dat );
uTextFormat |= DT_VCENTER;
if ( itemType == CIT_SUBTEXT1 )
- _DrawTextSmiley(hdcMem, prcItem, &text_size, pdnce->szSecondLineText, 0, -1, pdnce->ssSecondLine.plText, uTextFormat, dat->text_resize_smileys );
+ _DrawTextSmiley(hdcMem, prcItem, &text_size, pdnce->szSecondLineText, 0, -1, pdnce->ssSecondLine.plText, uTextFormat, dat->text_resize_smileys );
else
- _DrawTextSmiley(hdcMem, prcItem, &text_size, pdnce->szThirdLineText, 0, -1, pdnce->ssThirdLine.plText, uTextFormat, dat->text_resize_smileys );
+ _DrawTextSmiley(hdcMem, prcItem, &text_size, pdnce->szThirdLineText, 0, -1, pdnce->ssThirdLine.plText, uTextFormat, dat->text_resize_smileys );
}
}
text_rc.right = max( text_rc.right, prcItem->right );
@@ -3135,7 +3135,7 @@ void CLCPaint::_DrawContactExtraIcon( HDC hdcMem, ClcData *dat, ClcContact *Draw COLORREF colourFg;
_GetBlendMode( dat, Drawing, selected, hottrack, GIM_EXTRAICON_AFFECT, &colourFg, &mode );
if (Drawing->iExtraImage[iImage] != EMPTY_EXTRA_ICON)
- ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[iImage], hdcMem,
+ ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[iImage], hdcMem,
rc->left, rc->top, 0, 0, CLR_NONE, colourFg, mode );
}
}
@@ -3150,10 +3150,10 @@ void CLCPaint::_DrawContactLine( HDC hdcMem, ClcData *dat, ClcContact *Drawing, rc1.bottom = rc1.top + 2;
rc2.top += ( rc2.bottom - rc2.top ) >> 1;
rc2.bottom = rc2.top + 2;
- {
+ {
RECT rcTemp = rc1;
IntersectRect( &rc1, &rcTemp, rcPaint );
- }
+ }
{ //Subtract icon rect from left and right.
RECT rcTemp;
@@ -3168,10 +3168,10 @@ void CLCPaint::_DrawContactLine( HDC hdcMem, ClcData *dat, ClcContact *Drawing, DrawEdge(hdcMem, &rc1, BDR_SUNKENOUTER, BF_RECT );
ske_SetRectOpaque(hdcMem, &rc1 );
}
- {
+ {
RECT rcTemp = rc2;
IntersectRect( &rc2, &rcTemp, rcPaint );
- }
+ }
if ( rc2.right-rc2.left >= 6 && !IsRectEmpty( &rc2 ))
{
DrawEdge(hdcMem, &rc2, BDR_SUNKENOUTER, BF_RECT );
@@ -3182,9 +3182,9 @@ void CLCPaint::_DrawContactLine( HDC hdcMem, ClcData *dat, ClcContact *Drawing, void CLCPaint::_DrawContactItems( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT *row_rc, RECT *free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint )
{
UINT uTextFormat = DT_NOPREFIX |
- /*DT_VCENTER |*/
- DT_SINGLELINE |
- ( dat->text_rtl ? DT_RTLREADING : 0 ) |
+ /*DT_VCENTER |*/
+ DT_SINGLELINE |
+ ( dat->text_rtl ? DT_RTLREADING : 0 ) |
( dat->text_align_right ? DT_RIGHT : 0 )|
( gl_TrimText?DT_END_ELLIPSIS:0 )|
(( dat->force_in_dialog || dat->bkChanged ) ? DT_FORCENATIVERENDER:0 );
@@ -3204,7 +3204,7 @@ void CLCPaint::_DrawContactItems( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContac case CIT_AVATAR:
_DrawContactAvatar(hdcMem, dat, Drawing, row_rc, selected, hottrack, text_rc, prcItem );
break;
- case CIT_ICON:
+ case CIT_ICON:
_DrawContactIcon(hdcMem, dat, Drawing, selected, hottrack, text_rc, prcItem );
break;
case CIT_TEXT:
@@ -3250,7 +3250,7 @@ void CLCPaint::_PaintRowItems ( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact ske_ResetTextEffect(hdcMem );
}
-/* TODO Render items
+/* TODO Render items
V avatar
V avatars overlays
@@ -3265,7 +3265,7 @@ V groups and divider lines Milestones to implement Extended row layout
- 1. Implement separate Row item position calculation and drawing
-V a. Separation of painting and positions calculation
+V a. Separation of painting and positions calculation
V b. Use Items rect array for hit test
. c. Calculate row height via appropriate function
. d. Invalidate row items only when needed
diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp index 3fb5c65ab8..64670b9e97 100644 --- a/plugins/Clist_modern/src/modern_clcutils.cpp +++ b/plugins/Clist_modern/src/modern_clcutils.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_clc.h"
#include "hdr/modern_commonprototypes.h"
@@ -59,10 +61,10 @@ int cliHitTest(HWND hwnd,ClcData *dat,int testx,int testy,ClcContact **contact,C return -1;
}
- // Get hit item
+ // Get hit item
hit = cliRowHitTest(dat, dat->yScroll + testy);
- if (hit != -1)
+ if (hit != -1)
hit = cliGetRowByIndex(dat, hit, &hitcontact, &hitgroup);
if (hit == -1) {
@@ -73,26 +75,26 @@ int cliHitTest(HWND hwnd,ClcData *dat,int testx,int testy,ClcContact **contact,C if (group) *group = hitgroup;
/////////
- if (((testx < hitcontact->pos_indent) && !dat->text_rtl) ||
- ((testx>clRect.right-hitcontact->pos_indent) && dat->text_rtl))
+ if (((testx < hitcontact->pos_indent) && !dat->text_rtl) ||
+ ((testx>clRect.right-hitcontact->pos_indent) && dat->text_rtl))
{
if (flags) *flags |= CLCHT_ONITEMINDENT;
return hit;
}
- if (RectHitTest(&hitcontact->pos_check, testx, testy))
+ if (RectHitTest(&hitcontact->pos_check, testx, testy))
{
if (flags) *flags |= CLCHT_ONITEMCHECK;
return hit;
}
- if (RectHitTest(&hitcontact->pos_avatar, testx, testy))
+ if (RectHitTest(&hitcontact->pos_avatar, testx, testy))
{
if (flags) *flags |= CLCHT_ONITEMICON;
return hit;
}
- if (RectHitTest(&hitcontact->pos_icon, testx, testy))
+ if (RectHitTest(&hitcontact->pos_icon, testx, testy))
{
if (flags) *flags |= CLCHT_ONITEMICON;
return hit;
@@ -103,9 +105,9 @@ int cliHitTest(HWND hwnd,ClcData *dat,int testx,int testy,ClcContact **contact,C {
// int c = -1;
int i;
- for (i=0; i < dat->extraColumnsCount; i++)
- {
- if (RectHitTest(&hitcontact->pos_extra[i], testx, testy))
+ for (i=0; i < dat->extraColumnsCount; i++)
+ {
+ if (RectHitTest(&hitcontact->pos_extra[i], testx, testy))
{
if (flags) *flags |= CLCHT_ONITEMEXTRA|(i << 24);
return hit;
@@ -119,7 +121,7 @@ int cliHitTest(HWND hwnd,ClcData *dat,int testx,int testy,ClcContact **contact,C return hit;
}
- if (RectHitTest(&hitcontact->pos_label, testx, testy))
+ if (RectHitTest(&hitcontact->pos_label, testx, testy))
{
if (flags) *flags |= CLCHT_ONITEMLABEL;
return hit;
@@ -160,7 +162,7 @@ void cliScrollTo(HWND hwnd,ClcData *dat,int desty,int noSmooth) | GetKeyState( VK_HOME )
| GetKeyState( VK_END )) & 0x8000 );
- if ( !noSmooth && !keyDown)
+ if ( !noSmooth && !keyDown)
{
startTick = GetTickCount();
for (;;) {
@@ -171,12 +173,12 @@ void cliScrollTo(HWND hwnd,ClcData *dat,int desty,int noSmooth) ScrollWindowEx(hwnd, 0, previousy-dat->yScroll,NULL,NULL,NULL,NULL,SW_INVALIDATE);
else
{
- CallService(MS_SKINENG_UPTATEFRAMEIMAGE,(WPARAM) hwnd, (LPARAM) 0);
+ CallService(MS_SKINENG_UPTATEFRAMEIMAGE,(WPARAM) hwnd, (LPARAM) 0);
//InvalidateRectZ(hwnd,NULL,FALSE);
}
previousy = dat->yScroll;
SetScrollPos(hwnd,SB_VERT,dat->yScroll,TRUE);
- CallService(MS_SKINENG_UPTATEFRAMEIMAGE,(WPARAM) hwnd, (LPARAM) 0);
+ CallService(MS_SKINENG_UPTATEFRAMEIMAGE,(WPARAM) hwnd, (LPARAM) 0);
UpdateWindow(hwnd);
}
}
@@ -221,8 +223,8 @@ void cliRecalcScrollBar(HWND hwnd,ClcData *dat) if ( GetWindowLongPtr(hwnd,GWL_STYLE)&CLS_CONTACTLIST ) {
if ( dat->noVScrollbar == 0 ) SetScrollInfo(hwnd,SB_VERT,&si,TRUE);
//else SetScrollInfo(hwnd,SB_VERT,&si,FALSE);
- }
- else
+ }
+ else
SetScrollInfo(hwnd,SB_VERT,&si,TRUE);
g_mutex_bSizing = 1;
cliScrollTo(hwnd,dat,dat->yScroll,1);
@@ -276,7 +278,7 @@ void cliBeginRenameSelection(HWND hwnd,ClcData *dat) if (contact->type == CLCIT_CONTACT && contact->isSubcontact)
subident = dat->subIndent;
- else
+ else
subident = 0;
for (indent = 0;group->parent;indent++,group = group->parent);
@@ -290,12 +292,12 @@ void cliBeginRenameSelection(HWND hwnd,ClcData *dat) for (i=0; i <= FONTID_MODERN_MAX; i++)
if (h < dat->fontModernInfo[i].fontHeight+4) h = dat->fontModernInfo[i].fontHeight+4;
}
- //TODO contact->pos_label
+ //TODO contact->pos_label
{
- RECT rectW;
+ RECT rectW;
int h2;
GetWindowRect(hwnd,&rectW);
// w = contact->pos_full_first_row.right-contact->pos_full_first_row.left;
@@ -379,21 +381,21 @@ int GetDropTargetInformation(HWND hwnd,ClcData *dat,POINT pt) topItem = cliGetRowByIndex(dat,topItem,&topcontact,&topgroup);
ok = 1;
} else if ((pt.y+dat->yScroll >= cliGetRowTopY(dat,hit+1)-dat->insertionMarkHitHeight)
- || (contact->type == CLCIT_GROUP && contact->group->expanded && contact->group->cl.count>0))
+ || (contact->type == CLCIT_GROUP && contact->group->expanded && contact->group->cl.count>0))
{
//could be insertion mark (below)
topItem = hit; bottomItem = hit+1;
topcontact = contact; topgroup = group;
bottomItem = cliGetRowByIndex(dat,bottomItem,&bottomcontact,&bottomgroup);
- ok = 1;
+ ok = 1;
}
if (ok)
{
if (bottomItem == -1 && contact->type == CLCIT_GROUP)
{
bottomItem = topItem+1;
- }
- else
+ }
+ else
{
if (bottomItem == -1 && contact->type != CLCIT_GROUP && contact->groupId == 0)
{
@@ -403,7 +405,7 @@ int GetDropTargetInformation(HWND hwnd,ClcData *dat,POINT pt) if (bottomItem != -1 && bottomcontact->type != CLCIT_GROUP)
{
ClcGroup *gr = bottomgroup;
- do
+ do
{
bottomItem = cliGetRowByIndex(dat,bottomItem-1,&bottomcontact,&bottomgroup);}
while (bottomItem >= 0 && bottomcontact->type != CLCIT_GROUP && bottomgroup == gr);
@@ -417,35 +419,35 @@ int GetDropTargetInformation(HWND hwnd,ClcData *dat,POINT pt) int bi = cliGetRowByIndex(dat,bottomItem,&bottomcontact,&bottomgroup);
if (bi != -1)
{
- group = bottomgroup;
+ group = bottomgroup;
if (bottomcontact == movecontact || group == movecontact->group) return DROPTARGET_ONSELF;
dat->nInsertionLevel = -1; // decreasing here
for (;group;group = group->parent)
- {
+ {
dat->nInsertionLevel++;
if (group == movecontact->group) return DROPTARGET_ONSELF;
}
}
- }
+ }
dat->iInsertionMark = bottomItem;
dat->selection = nSetSelection;
return DROPTARGET_INSERTION;
}
}
- if (contact->type == CLCIT_GROUP)
+ if (contact->type == CLCIT_GROUP)
{
- if (dat->iInsertionMark == -1)
+ if (dat->iInsertionMark == -1)
{
- if (movecontact->type == CLCIT_GROUP)
+ if (movecontact->type == CLCIT_GROUP)
{ //check not moving onto its own subgroup
dat->iInsertionMark = hit+1;
- for (;group;group = group->parent)
+ for (;group;group = group->parent)
{
dat->nInsertionLevel++;
if (group == movecontact->group) return DROPTARGET_ONSELF;
}
}
- dat->selection = hit;
+ dat->selection = hit;
return DROPTARGET_ONGROUP;
}
}
@@ -465,11 +467,11 @@ void RegisterCLUIFonts( void ); void LoadCLCFonts( HWND hwnd, ClcData *dat )
{
RegisterCLUIFonts();
-
+
HDC hdc = GetDC(hwnd);
HFONT holdfont = (HFONT)GetCurrentObject( hdc, OBJ_FONT );
-
- for ( int i=0 ; i <= FONTID_MODERN_MAX; i++ )
+
+ for ( int i=0 ; i <= FONTID_MODERN_MAX; i++ )
{
if ( !dat->fontModernInfo[i].changed && dat->fontModernInfo[i].hFont )
{
@@ -493,11 +495,11 @@ void LoadCLCFonts( HWND hwnd, ClcData *dat ) }
void LoadCLCOptions(HWND hwnd, ClcData *dat )
-{
+{
int i;
g_CluiData.fDisableSkinEngine = db_get_b(NULL,"ModernData","DisableEngine", SETTING_DISABLESKIN_DEFAULT);
-
+
LoadCLCFonts( hwnd, dat );
g_CluiData.bSortByOrder[0] = db_get_b(NULL,"CList","SortBy1",SETTING_SORTBY1_DEFAULT);
@@ -508,7 +510,7 @@ void LoadCLCOptions(HWND hwnd, ClcData *dat ) // Row
dat->row_min_heigh = db_get_w(NULL,"CList","MinRowHeight",CLCDEFAULT_ROWHEIGHT);
dat->row_border = db_get_w(NULL,"CList","RowBorder",SETTING_ROWBORDER_DEFAULT);
- dat->row_before_group_space = ((hwnd != pcli->hwndContactTree && pcli->hwndContactTree != NULL)
+ dat->row_before_group_space = ((hwnd != pcli->hwndContactTree && pcli->hwndContactTree != NULL)
|| !db_get_b(NULL,"ModernData","UseAdvancedRowLayout",SETTING_ROW_ADVANCEDLAYOUT_DEFAULT))?0:db_get_w(NULL,"ModernSkin","SpaceBeforeGroup",SKIN_SPACEBEFOREGROUP_DEFAULT);
dat->row_variable_height = db_get_b(NULL,"CList","VariableRowHeight",SETTING_VARIABLEROWHEIGHT_DEFAULT);
dat->row_align_left_items_to_left = db_get_b(NULL,"CList","AlignLeftItemsToLeft",SETTING_ALIGNLEFTTOLEFT_DEFAULT);
@@ -702,33 +704,33 @@ void LoadCLCOptions(HWND hwnd, ClcData *dat ) if (dat->hBmpBackground) {DeleteObject(dat->hBmpBackground); dat->hBmpBackground = NULL;}
if (dat->hMenuBackground) {DeleteObject(dat->hMenuBackground); dat->hMenuBackground = NULL;}
-
+
dat->useWindowsColours = db_get_b(NULL, "CLC", "UseWinColours", CLCDEFAULT_USEWINDOWSCOLOURS);
if (g_CluiData.fDisableSkinEngine)
{
DBVARIANT dbv;
- if ( !dat->bkChanged)
+ if ( !dat->bkChanged)
{
dat->bkColour = sttGetColor("CLC","BkColour",GetSysColor(COLOR_3DFACE));
- {
- if ( db_get_b(NULL,"CLC","UseBitmap",CLCDEFAULT_USEBITMAP))
+ {
+ if ( db_get_b(NULL,"CLC","UseBitmap",CLCDEFAULT_USEBITMAP))
{
- if ( !db_get_s(NULL,"CLC","BkBitmap",&dbv))
+ if ( !db_get_s(NULL,"CLC","BkBitmap",&dbv))
{
- dat->hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, (LPARAM)dbv.pszVal);
- db_free(&dbv);
+ dat->hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, (LPARAM)dbv.pszVal);
+ db_free(&dbv);
}
}
}
dat->backgroundBmpUse = db_get_w(NULL,"CLC","BkBmpUse",CLCDEFAULT_BKBMPUSE);
- }
+ }
dat->MenuBkColor = sttGetColor("Menu","BkColour",CLCDEFAULT_BKCOLOUR);
dat->MenuBkHiColor = sttGetColor("Menu","SelBkColour",CLCDEFAULT_SELBKCOLOUR);
dat->MenuTextColor = sttGetColor("Menu","TextColour",CLCDEFAULT_TEXTCOLOUR);
dat->MenuTextHiColor = sttGetColor("Menu","SelTextColour",CLCDEFAULT_MODERN_SELTEXTCOLOUR);
-
+
if ( db_get_b(NULL,"Menu","UseBitmap",CLCDEFAULT_USEBITMAP)) {
if ( !db_get_s(NULL,"Menu","BkBitmap",&dbv)) {
dat->hMenuBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, (LPARAM)dbv.pszVal);
@@ -737,7 +739,7 @@ void LoadCLCOptions(HWND hwnd, ClcData *dat ) }
dat->MenuBmpUse = db_get_w(NULL,"Menu","BkBmpUse",CLCDEFAULT_BKBMPUSE);
}
-
+
dat->greyoutFlags = db_get_dw(NULL,"CLC","GreyoutFlags",CLCDEFAULT_GREYOUTFLAGS);
dat->offlineModes = db_get_dw(NULL,"CLC","OfflineModes",CLCDEFAULT_OFFLINEMODES);
dat->selBkColour = sttGetColor("CLC","SelBkColour",CLCDEFAULT_SELBKCOLOUR);
@@ -745,7 +747,7 @@ void LoadCLCOptions(HWND hwnd, ClcData *dat ) dat->hotTextColour = db_get_dw(NULL,"CLC","HotTextColour",CLCDEFAULT_MODERN_HOTTEXTCOLOUR);
dat->quickSearchColour = db_get_dw(NULL,"CLC","QuickSearchColour",CLCDEFAULT_MODERN_QUICKSEARCHCOLOUR);
if ( !g_szMetaModuleName && ServiceExists(MS_MC_GETPROTOCOLNAME)) g_szMetaModuleName = (char *)CallService(MS_MC_GETPROTOCOLNAME, 0, 0);
- dat->IsMetaContactsEnabled = (!(GetWindowLongPtr(hwnd,GWL_STYLE)&CLS_MANUALUPDATE)) &&
+ dat->IsMetaContactsEnabled = (!(GetWindowLongPtr(hwnd,GWL_STYLE)&CLS_MANUALUPDATE)) &&
g_szMetaModuleName && db_get_b(NULL,g_szMetaModuleName,"Enabled",1) && ServiceExists(MS_MC_GETDEFAULTCONTACT);
if (pcli->hwndContactTree == NULL || dat->hWnd == pcli->hwndContactTree)
@@ -755,7 +757,7 @@ void LoadCLCOptions(HWND hwnd, ClcData *dat ) dat->expandMeta = db_get_b(NULL,"CLC","MetaExpanding",SETTING_METAEXPANDING_DEFAULT);
dat->useMetaIcon = db_get_b(NULL,"CLC","Meta",SETTING_USEMETAICON_DEFAULT);
-
+
dat->drawOverlayedStatus = db_get_b(NULL,"CLC","DrawOverlayedStatus",SETTING_DRAWOVERLAYEDSTATUS_DEFAULT);
dat->dbbMetaHideExtra = db_get_b(NULL,"CLC","MetaHideExtra",SETTING_METAHIDEEXTRA_DEFAULT);
@@ -787,7 +789,7 @@ int ExpandMetaContact(HWND hwnd, ClcContact *contact, ClcData *dat, BOOL bExpand contact->SubExpanded = bExpand;
db_set_b(contact->hContact,"CList","Expanded",contact->SubExpanded);
dat->needsResort = 1;
- pcli->pfnSortCLC(hwnd,dat,1);
+ pcli->pfnSortCLC(hwnd,dat,1);
cliRecalcScrollBar(hwnd,dat);
return contact->SubExpanded;
}
@@ -809,8 +811,8 @@ int cliFindRowByText(HWND hwnd, ClcData *dat, const TCHAR *text, int prefixOk) continue;
}
contact = group->cl.items[group->scanIndex];
- if (contact->type != CLCIT_DIVIDER)
- {
+ if (contact->type != CLCIT_DIVIDER)
+ {
bool found;
if (dat->filterSearch) {
TCHAR *lowered_szText = CharLowerW(NEWTSTR_ALLOCA(contact->szText));
@@ -826,7 +828,7 @@ int cliFindRowByText(HWND hwnd, ClcData *dat, const TCHAR *text, int prefixOk) pcli->pfnSetGroupExpand(hwnd, dat, group, 1);
return pcli->pfnGetRowsPriorTo(&dat->list, contactGroup, contactScanIndex+SubCount);
}
- if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP)
+ if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP)
{
if ( !(dat->exStyle & CLS_EX_QUICKSEARCHVISONLY) || group->cl.items[group->scanIndex]->group->expanded) {
group = group->cl.items[group->scanIndex]->group;
@@ -836,7 +838,7 @@ int cliFindRowByText(HWND hwnd, ClcData *dat, const TCHAR *text, int prefixOk) }
}
}
- if (contact->type == CLCIT_CONTACT && contact->SubAllocated)
+ if (contact->type == CLCIT_CONTACT && contact->SubAllocated)
{
if ( !(dat->exStyle & CLS_EX_QUICKSEARCHVISONLY) || contact->SubExpanded )
{
diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp index 0f41e16dcf..511efe34aa 100644 --- a/plugins/Clist_modern/src/modern_clistevents.cpp +++ b/plugins/Clist_modern/src/modern_clistevents.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include "m_clui.h"
#include "hdr/modern_clist.h"
@@ -115,7 +117,7 @@ struct CListEvent* cli_AddEvent(CLISTEVENT *cle) mii.fMask = MIIM_DATA | MIIM_BITMAP | MIIM_ID;
if (p->cle.pszService && ( !strncmp("SRMsg/ReadMessage", p->cle.pszService, SIZEOF("SRMsg/ReadMessage"))
|| !strncmp("GChat/DblClickEvent", p->cle.pszService, SIZEOF("GChat/DblClickEvent"))))
-
+
{
// dup check only for msg events
for (j = 0; j < GetMenuItemCount(g_CluiData.hMenuNotify); j++) {
@@ -153,9 +155,9 @@ struct CListEvent* cli_AddEvent(CLISTEVENT *cle) g_CluiData.iIconNotify = p->imlIconIndex;
}
}
- }
+ }
- else if (p->cle.hContact != 0 && (p->cle.flags & CLEF_ONLYAFEW))
+ else if (p->cle.hContact != 0 && (p->cle.flags & CLEF_ONLYAFEW))
{
g_CluiData.iIconNotify = p->imlIconIndex;
g_CluiData.hUpdateContact = p->cle.hContact;
@@ -169,7 +171,7 @@ struct CListEvent* cli_AddEvent(CLISTEVENT *cle) }
CLUI__cliInvalidateRect(g_CluiData.hwndEventFrame, NULL, FALSE);
}
-
+
return p;
}
@@ -180,9 +182,9 @@ int cli_RemoveEvent(HANDLE hContact, HANDLE hDbEvent) int res = 0;
// Find the event that should be removed
- for (i=0; i < pcli->events.count; i++)
+ for (i=0; i < pcli->events.count; i++)
{
- if ((pcli->events.items[i]->cle.hContact == hContact) && (pcli->events.items[i]->cle.hDbEvent == hDbEvent))
+ if ((pcli->events.items[i]->cle.hContact == hContact) && (pcli->events.items[i]->cle.hDbEvent == hDbEvent))
{
break;
}
@@ -202,8 +204,8 @@ int cli_RemoveEvent(HANDLE hContact, HANDLE hDbEvent) if (nmi && nmi->hContact == hContact && nmi->hDbEvent == hDbEvent) {
free(nmi);
DeleteMenu(g_CluiData.hMenuNotify, pcli->events.items[i]->menuId, MF_BYCOMMAND);
- }
- }
+ }
+ }
}
res = corecli.pfnRemoveEvent(hContact, hDbEvent);
@@ -243,19 +245,19 @@ static BOOL sttDrawEventAreaBackground(HWND hwnd, HDC hdc, RECT *rect) {
BOOL bFloat = (GetParent(hwnd) != pcli->hwndContactList);
if (g_CluiData.fDisableSkinEngine || !g_CluiData.fLayered || bFloat)
- {
+ {
RECT rc;
if (rect) rc = *rect;
else GetClientRect(hwnd,&rc);
if ( !event_area.hBmpBackground && !event_area.useWinColors)
- {
+ {
HBRUSH hbr = CreateSolidBrush(event_area.bkColour);
FillRect(hdc, &rc, hbr);
DeleteObject(hbr);
}
- else
+ else
{
DrawBackGround(hwnd,hdc,event_area.hBmpBackground,event_area.bkColour,event_area.backgroundBmpUse);
}
@@ -267,9 +269,9 @@ COLORREF sttGetColor(char * module, char * color, COLORREF defColor); //clcutils static int ehhEventAreaBackgroundSettingsChanged(WPARAM wParam, LPARAM lParam)
{
- if (event_area.hBmpBackground)
+ if (event_area.hBmpBackground)
{
- DeleteObject(event_area.hBmpBackground);
+ DeleteObject(event_area.hBmpBackground);
event_area.hBmpBackground = NULL;
}
if (g_CluiData.fDisableSkinEngine)
@@ -284,7 +286,7 @@ static int ehhEventAreaBackgroundSettingsChanged(WPARAM wParam, LPARAM lParam) }
event_area.useWinColors = db_get_b(NULL, "EventArea", "UseWinColours", CLCDEFAULT_USEWINDOWSCOLOURS);
event_area.backgroundBmpUse = db_get_w(NULL, "EventArea", "BkBmpUse", CLCDEFAULT_BKBMPUSE);
- }
+ }
PostMessage(pcli->hwndContactList,WM_SIZE, 0, 0);
return 0;
}
@@ -310,7 +312,7 @@ void EventArea_ConfigureEventArea() static int EventArea_PaintCallbackProc(HWND hWnd, HDC hDC, RECT *rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData)
{
- return EventArea_Draw(hWnd,hDC);
+ return EventArea_Draw(hWnd,hDC);
}
static int EventArea_Draw(HWND hwnd, HDC hDC)
@@ -327,7 +329,7 @@ static int EventArea_DrawWorker(HWND hWnd, HDC hDC) {
RECT rc;
HFONT hOldFont;
- GetClientRect(hWnd,&rc);
+ GetClientRect(hWnd,&rc);
if ( g_CluiData.fDisableSkinEngine )
sttDrawEventAreaBackground( hWnd, hDC, &rc );
else
@@ -337,7 +339,7 @@ static int EventArea_DrawWorker(HWND hWnd, HDC hDC) SetBkMode(hDC,TRANSPARENT);
int iCount = GetMenuItemCount(g_CluiData.hMenuNotify);
- rc.left += 26;
+ rc.left += 26;
if (g_CluiData.hUpdateContact != 0) {
TCHAR *szName = pcli->pfnGetContactDisplayName(g_CluiData.hUpdateContact, 0);
int iIcon = cli_GetContactIcon(g_CluiData.hUpdateContact);
@@ -363,7 +365,7 @@ static int EventArea_DrawWorker(HWND hWnd, HDC hDC) rc.left += 18;
ske_ImageList_DrawEx(g_himlCListClc, nmi->iIcon, hDC, 4, (rc.bottom + rc.top) / 2 - 8, 16, 16, CLR_NONE, CLR_NONE, ILD_NORMAL);
ske_DrawText(hDC, szName, -1, &rc, DT_VCENTER | DT_SINGLELINE);
- }
+ }
else {
HICON hIcon = (HICON)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_BLANK), IMAGE_ICON, 16, 16, 0);
ske_DrawText(hDC, g_CluiData.szNoEvents, lstrlen(g_CluiData.szNoEvents), &rc, DT_VCENTER | DT_SINGLELINE);
@@ -402,7 +404,7 @@ int EventArea_Create(HWND hCluiWnd) {
CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Event Area Background")"/EventArea"),0);
- HookEvent(ME_BACKGROUNDCONFIG_CHANGED,ehhEventAreaBackgroundSettingsChanged);
+ HookEvent(ME_BACKGROUNDCONFIG_CHANGED,ehhEventAreaBackgroundSettingsChanged);
ehhEventAreaBackgroundSettingsChanged(0, 0);
WNDCLASS wndclass = {0};
@@ -470,7 +472,7 @@ static LRESULT CALLBACK EventArea_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LP return TRUE;
}
}
- }
+ }
break;
case WM_DRAWITEM:
@@ -485,7 +487,7 @@ static LRESULT CALLBACK EventArea_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LP if (GetMenuItemInfoA(g_CluiData.hMenuNotify, (UINT) dis->itemID, FALSE, &mii) != 0) {
nmi = (NotifyMenuItemExData *) mii.dwItemData;
if (nmi) {
- int iIcon = cli_GetContactIcon(nmi->hContact);
+ int iIcon = cli_GetContactIcon(nmi->hContact);
ske_ImageList_DrawEx(g_himlCListClc, nmi->iIcon, dis->hDC, 2, (dis->rcItem.bottom + dis->rcItem.top - GetSystemMetrics(SM_CYSMICON)) / 2, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), CLR_NONE, CLR_NONE, ILD_NORMAL);
ske_ImageList_DrawEx(g_himlCListClc, iIcon, dis->hDC, 2+GetSystemMetrics(SM_CXSMICON)+2, (dis->rcItem.bottom + dis->rcItem.top - GetSystemMetrics(SM_CYSMICON)) / 2, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), CLR_NONE, CLR_NONE, ILD_NORMAL);
return TRUE;
@@ -556,7 +558,7 @@ static LRESULT CALLBACK EventArea_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LP hdc = GetDC(hwnd);
hdc2 = CreateCompatibleDC(hdc);
hbmp = ske_CreateDIB32(rc.right,rc.bottom);
- hbmpo = (HBITMAP)SelectObject(hdc2,hbmp);
+ hbmpo = (HBITMAP)SelectObject(hdc2,hbmp);
ske_BltBackImage(hwnd,hdc2,&rc);
EventArea_DrawWorker(hwnd,hdc2);
BitBlt(hdc,rc.left,rc.top,rc.right-rc.left,rc.bottom-rc.top,
diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp index 354a9ce843..9516654e00 100644 --- a/plugins/Clist_modern/src/modern_clistmenus.cpp +++ b/plugins/Clist_modern/src/modern_clistmenus.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_clist.h"
#include "m_genmenu.h"
@@ -65,7 +67,7 @@ void UninitCustomMenus(void) //////////////////////////////////////////////////////////////////////////
#define CLUI_FAVSETRATE "CLUI/SetContactRate" //LParam is rate, Wparam is contact handle
-#define CLUI_FAVTOGGLESHOWOFFLINE "CLUI/ToggleContactShowOffline"
+#define CLUI_FAVTOGGLESHOWOFFLINE "CLUI/ToggleContactShowOffline"
static HGENMENU hFavoriteContactMenu = NULL;
static HGENMENU *hFavoriteContactMenuItems = NULL;
@@ -79,7 +81,7 @@ static TCHAR *rates[] = { LPGENT("None"),
LPGENT("Low"),
LPGENT("Medium"),
- LPGENT("High")
+ LPGENT("High")
};
static IconItem iconList[] =
@@ -108,14 +110,14 @@ static int FAV_OnContactMenuBuild(WPARAM wParam,LPARAM lParam) int bufsize = (lstrlen(FAVMENUROOTNAME)+lstrlen(rates[bContactRate])+15)*sizeof(TCHAR);
TCHAR *name = (TCHAR*)_alloca(bufsize);
mir_sntprintf(name, bufsize/sizeof(TCHAR), _T("%s (%s)"),FAVMENUROOTNAME,rates[bContactRate]);
- mi.ptszName = name;
+ mi.ptszName = name;
}
mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR;
- if ( !hFavoriteContactMenu)
+ if ( !hFavoriteContactMenu)
hFavoriteContactMenu = Menu_AddContactMenuItem(&mi);
else {
mi.flags |= CMIM_FLAGS | CMIM_NAME;
- Menu_ModifyItem(hFavoriteContactMenu, &mi);
+ Menu_ModifyItem(hFavoriteContactMenu, &mi);
bModifyMenu = TRUE;
}
@@ -153,7 +155,7 @@ static int FAV_OnContactMenuBuild(WPARAM wParam,LPARAM lParam) mi.position = -100000000;
if (bModifyMenu && hShowIfOflineItem) {
mi.flags |= CMIM_FLAGS | CMIM_ICON;
- Menu_ModifyItem(hShowIfOflineItem, &mi);
+ Menu_ModifyItem(hShowIfOflineItem, &mi);
}
else hShowIfOflineItem = Menu_AddContactMenuItem(&mi);
@@ -193,7 +195,7 @@ int UnloadFavoriteContactMenu() if (hFavoriteContactMenu)
CallService(MO_REMOVEMENUITEM,(WPARAM)hFavoriteContactMenu,0);
- hFavoriteContactMenu = NULL;
+ hFavoriteContactMenu = NULL;
return 0;
}
diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp index fd2e204e89..9d0e654fb4 100644 --- a/plugins/Clist_modern/src/modern_clistmod.cpp +++ b/plugins/Clist_modern/src/modern_clistmod.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_clist.h"
#include "hdr/modern_commonprototypes.h"
@@ -171,8 +173,8 @@ HRESULT CluiLoadModule() CreateServiceFunction("ModernSkinSel/Active", SvcActiveSkin);
CreateServiceFunction("ModernSkinSel/Preview", SvcPreviewSkin);
CreateServiceFunction("ModernSkinSel/Apply", SvcApplySkin);
-
- HookEvent(ME_DB_CONTACT_ADDED,ContactAdded);
+
+ HookEvent(ME_DB_CONTACT_ADDED,ContactAdded);
CreateServiceFunction(MS_CLIST_TOGGLEHIDEOFFLINE,ToggleHideOffline);
@@ -183,7 +185,7 @@ HRESULT CluiLoadModule() hCListImages = ImageList_Create(16, 16, ILC_MASK|ILC_COLOR32, 32, 0);
InitCustomMenus();
InitTrayMenus();
-
+
CLUI::InitClui();
return S_OK;
}
@@ -222,13 +224,13 @@ int GetWindowVisibleState(HWND hWnd, int iStepX, int iStepY) if (iStepY <= 0) iStepY = 16;
HWND hwndFocused = GetFocus();
-
+
if ( IsIconic(hWnd) || !IsWindowVisible(hWnd))
return GWVS_HIDDEN;
-
+
if ( db_get_b(NULL,"CList","OnDesktop",SETTING_ONDESKTOP_DEFAULT) || !db_get_b(NULL, "CList", "BringToFront", SETTING_BRINGTOFRONT_DEFAULT))
return GWVS_VISIBLE;
-
+
if ( hwndFocused == pcli->hwndContactList || GetParent(hwndFocused) == pcli->hwndContactList )
return GWVS_VISIBLE;
@@ -294,7 +296,7 @@ int GetWindowVisibleState(HWND hWnd, int iStepX, int iStepY) a = ((a*g_CluiData.bCurrentAlpha)>>8);
po = (a>16);
}
-
+
if (po || (!rgn && ptr == 0)) {
BOOL hWndFound = FALSE;
HWND hAuxOld = NULL;
@@ -400,7 +402,7 @@ int cliShowHide(WPARAM wParam,LPARAM lParam) RECT rcWindow;
GetWindowRect(pcli->hwndContactList,&rcWindow);
if (Utils_AssertInsideScreen(&rcWindow) == 1)
- MoveWindow(pcli->hwndContactList, rcWindow.left, rcWindow.top,
+ MoveWindow(pcli->hwndContactList, rcWindow.left, rcWindow.top,
rcWindow.right - rcWindow.left, rcWindow.bottom - rcWindow.top, TRUE);
}
else { //It needs to be hidden
diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp index 04d6a8397b..8367508228 100644 --- a/plugins/Clist_modern/src/modern_clistopts.cpp +++ b/plugins/Clist_modern/src/modern_clistopts.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include "m_clui.h"
#include "hdr/modern_clist.h"
@@ -103,7 +105,7 @@ static INT_PTR CALLBACK DlgProcItemRowOpts(HWND hwndDlg, UINT msg, WPARAM wParam if (LOWORD(wParam) == IDC_UP) {
if (HIWORD(wParam) != BN_CLICKED)
return 0;
-
+
HWND hwndList = GetDlgItem(hwndDlg, IDC_LIST_ORDER);
int pos = SendMessage(hwndList, LB_GETCURSEL, 0, 0);
if (pos == LB_ERR)
@@ -242,7 +244,7 @@ static INT_PTR CALLBACK DlgProcItemAvatarOpts(HWND hwndDlg, UINT msg, WPARAM wPa TranslateDialogDefault(hwndDlg);
CheckDlgButton(hwndDlg, IDC_SHOW_AVATARS, db_get_b(NULL,"CList","AvatarsShow",SETTINGS_SHOWAVATARS_DEFAULT) == 1 ? BST_CHECKED : BST_UNCHECKED );
CheckDlgButton(hwndDlg, IDC_SHOW_ANIAVATARS, db_get_b(NULL,"CList","AvatarsAnimated", ServiceExists(MS_AV_GETAVATARBITMAP)) == 1 ? BST_CHECKED : BST_UNCHECKED );
- CheckDlgButton(hwndDlg, IDC_AVATAR_FASTDRAW, db_get_b(NULL,"CList","AvatarsInSeparateWnd",SETTINGS_AVATARINSEPARATE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);
+ CheckDlgButton(hwndDlg, IDC_AVATAR_FASTDRAW, db_get_b(NULL,"CList","AvatarsInSeparateWnd",SETTINGS_AVATARINSEPARATE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_AVATAR_DRAW_BORDER, db_get_b(NULL,"CList","AvatarsDrawBorders",SETTINGS_AVATARDRAWBORDER_DEFAULT) == 1 ? BST_CHECKED : BST_UNCHECKED );
CheckDlgButton(hwndDlg, IDC_AVATAR_ROUND_CORNERS, db_get_b(NULL,"CList","AvatarsRoundCorners",SETTINGS_AVATARROUNDCORNERS_DEFAULT) == 1 ? BST_CHECKED : BST_UNCHECKED );
CheckDlgButton(hwndDlg, IDC_AVATAR_CUSTOM_CORNER_SIZE_CHECK, db_get_b(NULL,"CList","AvatarsUseCustomCornerSize",SETTINGS_AVATARUSECUTOMCORNERSIZE_DEFAULT) == 1 ? BST_CHECKED : BST_UNCHECKED );
@@ -298,31 +300,31 @@ static INT_PTR CALLBACK DlgProcItemAvatarOpts(HWND hwndDlg, UINT msg, WPARAM wPa EnableWindow( GetDlgItem( hwndDlg, IDC_AVATAR_FASTDRAW), FALSE );
}
- if ( !IsDlgButtonChecked( hwndDlg, IDC_SHOW_ANIAVATARS ))
+ if ( !IsDlgButtonChecked( hwndDlg, IDC_SHOW_ANIAVATARS ))
EnableWindow( GetDlgItem( hwndDlg, IDC_AVATAR_FASTDRAW), FALSE );
if ( !IsDlgButtonChecked(hwndDlg,IDC_AVATAR_DRAW_BORDER)) {
EnableWindow(GetDlgItem(hwndDlg,IDC_AVATAR_BORDER_COLOR_L),FALSE);
EnableWindow(GetDlgItem(hwndDlg,IDC_AVATAR_BORDER_COLOR),FALSE);
}
-
+
if ( !IsDlgButtonChecked(hwndDlg,IDC_AVATAR_ROUND_CORNERS)) {
EnableWindow(GetDlgItem(hwndDlg,IDC_AVATAR_CUSTOM_CORNER_SIZE_CHECK),FALSE);
EnableWindow(GetDlgItem(hwndDlg,IDC_AVATAR_CUSTOM_CORNER_SIZE),FALSE);
EnableWindow(GetDlgItem(hwndDlg,IDC_AVATAR_CUSTOM_CORNER_SIZE_SPIN),FALSE);
- }
-
+ }
+
if ( !IsDlgButtonChecked(hwndDlg,IDC_AVATAR_CUSTOM_CORNER_SIZE_CHECK)) {
EnableWindow(GetDlgItem(hwndDlg,IDC_AVATAR_CUSTOM_CORNER_SIZE),FALSE);
EnableWindow(GetDlgItem(hwndDlg,IDC_AVATAR_CUSTOM_CORNER_SIZE_SPIN),FALSE);
- }
-
+ }
+
if ( !IsDlgButtonChecked(hwndDlg,IDC_AVATAR_OVERLAY_ICONS)) {
EnableWindow(GetDlgItem(hwndDlg,IDC_AVATAR_OVERLAY_ICON_NORMAL),FALSE);
EnableWindow(GetDlgItem(hwndDlg,IDC_AVATAR_OVERLAY_ICON_PROTOCOL),FALSE);
EnableWindow(GetDlgItem(hwndDlg,IDC_AVATAR_OVERLAY_ICON_CONTACT),FALSE);
}
-
+
if ( !ServiceExists(MS_AV_GETAVATARBITMAP)) {
EnableWindow(GetDlgItem(hwndDlg,IDC_SHOW_ANIAVATARS),FALSE);
SetDlgItemText(hwndDlg, IDC_SHOW_ANIAVATARS, TranslateT("Animate Avatars (GDI+ and Avatar Service module (avs.dll) are required)"));
@@ -377,7 +379,7 @@ static INT_PTR CALLBACK DlgProcItemAvatarOpts(HWND hwndDlg, UINT msg, WPARAM wPa EnableWindow(GetDlgItem(hwndDlg,IDC_AVATAR_CUSTOM_CORNER_SIZE),enabled && IsDlgButtonChecked(hwndDlg,IDC_AVATAR_CUSTOM_CORNER_SIZE_CHECK));
EnableWindow(GetDlgItem(hwndDlg,IDC_AVATAR_CUSTOM_CORNER_SIZE_SPIN),enabled && IsDlgButtonChecked(hwndDlg,IDC_AVATAR_CUSTOM_CORNER_SIZE_CHECK));
}
-
+
else if (LOWORD(wParam) == IDC_AVATAR_OVERLAY_ICONS) {
BOOL enabled = IsDlgButtonChecked(hwndDlg,IDC_SHOW_AVATARS) && IsDlgButtonChecked(hwndDlg,IDC_AVATAR_OVERLAY_ICONS);
@@ -470,7 +472,7 @@ static INT_PTR CALLBACK DlgProcItemIconOpts(HWND hwndDlg, UINT msg, WPARAM wPara case PSN_APPLY:
db_set_b(NULL,"CList","IconHideOnAvatar", (BYTE)IsDlgButtonChecked(hwndDlg,IDC_HIDE_ICON_ON_AVATAR));
db_set_b(NULL,"CList","IconDrawOnAvatarSpace", (BYTE)IsDlgButtonChecked(hwndDlg,IDC_DRAW_ON_AVATAR_SPACE));
- db_set_b(NULL,"CList","HideGroupsIcon", (BYTE)IsDlgButtonChecked(hwndDlg,IDC_HIDE_GROUPSICON));
+ db_set_b(NULL,"CList","HideGroupsIcon", (BYTE)IsDlgButtonChecked(hwndDlg,IDC_HIDE_GROUPSICON));
db_set_b(NULL,"CList","NoIconBlink", (BYTE)IsDlgButtonChecked(hwndDlg,IDC_ICONBLINK));
db_set_b(NULL,"CList","IconIgnoreSizeForRownHeight", (BYTE)IsDlgButtonChecked(hwndDlg,IDC_NOTCHECKICONSIZE));
db_set_b(NULL,"CList","AlwaysShowAlwaysVisIcon", (BYTE)IsDlgButtonChecked(hwndDlg,IDC_ALWAYS_VISIBLEICON));
@@ -532,7 +534,7 @@ static INT_PTR CALLBACK DlgProcItemTextOpts(HWND hwndDlg, UINT msg, WPARAM wPara {
int item;
TCHAR *align[] = {LPGENT("Left align group names"), LPGENT("Center group names"), LPGENT("Right align group names")};
- for (int i=0; i < sizeof(align)/sizeof(char*); i++)
+ for (int i=0; i < sizeof(align)/sizeof(char*); i++)
item = SendDlgItemMessage(hwndDlg, IDC_ALIGNGROUPCOMBO, CB_ADDSTRING, 0, (LPARAM)TranslateTS(align[i]));
SendDlgItemMessage(hwndDlg,IDC_ALIGNGROUPCOMBO,CB_SETCURSEL,db_get_b(NULL,"CList","AlignGroupCaptions",SETTING_ALIGNGROPCAPTION_DEFAULT),0);
}
@@ -546,7 +548,7 @@ static INT_PTR CALLBACK DlgProcItemTextOpts(HWND hwndDlg, UINT msg, WPARAM wPara CheckDlgButton(hwndDlg, IDC_APPEND_NICK, db_get_b(NULL,"CList","FirstLineAppendNick",SETTING_FIRSTLINE_APPENDNICK_DEFAULT) == 1 ? BST_CHECKED : BST_UNCHECKED );
CheckDlgButton(hwndDlg, IDC_TRIM_TEXT, db_get_b(NULL,"CList","TrimText",SETTING_FIRSTLINE_TRIMTEXT_DEFAULT) == 1 ? BST_CHECKED : BST_UNCHECKED );
{
- bool smileAddPresent = ServiceExists(MS_SMILEYADD_BATCHPARSE) != 0;
+ bool smileAddPresent = ServiceExists(MS_SMILEYADD_BATCHPARSE) != 0;
CLUI_ShowWindowMod(GetDlgItem(hwndDlg,IDC_REPLACE_SMILEYS), smileAddPresent ? SW_SHOW : SW_HIDE);
CLUI_ShowWindowMod(GetDlgItem(hwndDlg,IDC_USE_PROTOCOL_SMILEYS), smileAddPresent ? SW_SHOW : SW_HIDE);
//CLUI_ShowWindowMod(GetDlgItem(hwndDlg,IDC_RESIZE_SMILEYS), smileAddPresent ? SW_SHOW : SW_HIDE);
@@ -675,19 +677,19 @@ static INT_PTR CALLBACK DlgProcItemSecondLineOpts(HWND hwndDlg, UINT msg, WPARAM case WM_COMMAND:
if (LOWORD(wParam) == IDC_TEXT || LOWORD(wParam) == IDC_STATUS || LOWORD(wParam) == IDC_NICKNAME || LOWORD(wParam) == IDC_STATUS_MESSAGE
|| LOWORD(wParam) == IDC_LISTENING_TO || LOWORD(wParam) == IDC_CONTACT_TIME) {
- EnableWindow(GetDlgItem(hwndDlg,IDC_VARIABLE_TEXT), IsDlgButtonChecked(hwndDlg,IDC_TEXT)
+ EnableWindow(GetDlgItem(hwndDlg,IDC_VARIABLE_TEXT), IsDlgButtonChecked(hwndDlg,IDC_TEXT)
&& IsDlgButtonChecked(hwndDlg,IDC_SHOW));
- EnableWindow(GetDlgItem(hwndDlg,IDC_VARIABLES_L), IsDlgButtonChecked(hwndDlg,IDC_TEXT)
+ EnableWindow(GetDlgItem(hwndDlg,IDC_VARIABLES_L), IsDlgButtonChecked(hwndDlg,IDC_TEXT)
&& IsDlgButtonChecked(hwndDlg,IDC_SHOW));
- EnableWindow(GetDlgItem(hwndDlg,IDC_XSTATUS_HAS_PRIORITY), IsDlgButtonChecked(hwndDlg,IDC_SHOW) &&
- (IsDlgButtonChecked(hwndDlg,IDC_STATUS)
+ EnableWindow(GetDlgItem(hwndDlg,IDC_XSTATUS_HAS_PRIORITY), IsDlgButtonChecked(hwndDlg,IDC_SHOW) &&
+ (IsDlgButtonChecked(hwndDlg,IDC_STATUS)
|| IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE)));
- EnableWindow(GetDlgItem(hwndDlg,IDC_SHOW_STATUS_IF_NOAWAY), IsDlgButtonChecked(hwndDlg,IDC_SHOW) &&
+ EnableWindow(GetDlgItem(hwndDlg,IDC_SHOW_STATUS_IF_NOAWAY), IsDlgButtonChecked(hwndDlg,IDC_SHOW) &&
(IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE)));
- EnableWindow(GetDlgItem(hwndDlg,IDC_SHOW_LISTENING_IF_NOAWAY), IsDlgButtonChecked(hwndDlg,IDC_SHOW) &&
+ EnableWindow(GetDlgItem(hwndDlg,IDC_SHOW_LISTENING_IF_NOAWAY), IsDlgButtonChecked(hwndDlg,IDC_SHOW) &&
(IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE)));
- EnableWindow(GetDlgItem(hwndDlg,IDC_USE_NAME_AND_MESSAGE), IsDlgButtonChecked(hwndDlg,IDC_SHOW) &&
- (IsDlgButtonChecked(hwndDlg,IDC_STATUS)
+ EnableWindow(GetDlgItem(hwndDlg,IDC_USE_NAME_AND_MESSAGE), IsDlgButtonChecked(hwndDlg,IDC_SHOW) &&
+ (IsDlgButtonChecked(hwndDlg,IDC_STATUS)
|| IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE)));
}
else if (LOWORD(wParam) == IDC_SHOW) {
@@ -709,11 +711,11 @@ static INT_PTR CALLBACK DlgProcItemSecondLineOpts(HWND hwndDlg, UINT msg, WPARAM EnableWindow(GetDlgItem(hwndDlg,IDC_VARIABLE_TEXT), enabled && IsDlgButtonChecked(hwndDlg,IDC_TEXT));
EnableWindow(GetDlgItem(hwndDlg,IDC_VARIABLES_L), enabled && IsDlgButtonChecked(hwndDlg,IDC_TEXT));
- EnableWindow(GetDlgItem(hwndDlg,IDC_XSTATUS_HAS_PRIORITY), enabled && (IsDlgButtonChecked(hwndDlg,IDC_STATUS)
+ EnableWindow(GetDlgItem(hwndDlg,IDC_XSTATUS_HAS_PRIORITY), enabled && (IsDlgButtonChecked(hwndDlg,IDC_STATUS)
|| IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE)));
EnableWindow(GetDlgItem(hwndDlg,IDC_SHOW_STATUS_IF_NOAWAY), enabled && IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE));
EnableWindow(GetDlgItem(hwndDlg,IDC_SHOW_LISTENING_IF_NOAWAY), enabled && IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE));
- EnableWindow(GetDlgItem(hwndDlg,IDC_USE_NAME_AND_MESSAGE), enabled && (IsDlgButtonChecked(hwndDlg,IDC_STATUS)
+ EnableWindow(GetDlgItem(hwndDlg,IDC_USE_NAME_AND_MESSAGE), enabled && (IsDlgButtonChecked(hwndDlg,IDC_STATUS)
|| IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE)));
}
@@ -849,16 +851,16 @@ static INT_PTR CALLBACK DlgProcItemThirdLineOpts(HWND hwndDlg, UINT msg, WPARAM case WM_COMMAND:
if (LOWORD(wParam) == IDC_TEXT || LOWORD(wParam) == IDC_STATUS || LOWORD(wParam) == IDC_NICKNAME || LOWORD(wParam) == IDC_STATUS_MESSAGE
|| LOWORD(wParam) == IDC_LISTENING_TO || LOWORD(wParam) == IDC_CONTACT_TIME) {
- EnableWindow(GetDlgItem(hwndDlg,IDC_VARIABLE_TEXT), IsDlgButtonChecked(hwndDlg,IDC_TEXT)
+ EnableWindow(GetDlgItem(hwndDlg,IDC_VARIABLE_TEXT), IsDlgButtonChecked(hwndDlg,IDC_TEXT)
&& IsDlgButtonChecked(hwndDlg,IDC_SHOW));
- EnableWindow(GetDlgItem(hwndDlg,IDC_VARIABLES_L), IsDlgButtonChecked(hwndDlg,IDC_TEXT)
+ EnableWindow(GetDlgItem(hwndDlg,IDC_VARIABLES_L), IsDlgButtonChecked(hwndDlg,IDC_TEXT)
&& IsDlgButtonChecked(hwndDlg,IDC_SHOW));
- EnableWindow(GetDlgItem(hwndDlg,IDC_XSTATUS_HAS_PRIORITY), IsDlgButtonChecked(hwndDlg,IDC_SHOW) &&
- (IsDlgButtonChecked(hwndDlg,IDC_STATUS)
+ EnableWindow(GetDlgItem(hwndDlg,IDC_XSTATUS_HAS_PRIORITY), IsDlgButtonChecked(hwndDlg,IDC_SHOW) &&
+ (IsDlgButtonChecked(hwndDlg,IDC_STATUS)
|| IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE)));
EnableWindow(GetDlgItem(hwndDlg,IDC_USE_NAME_AND_MESSAGE), IsDlgButtonChecked(hwndDlg,IDC_SHOW) && (IsDlgButtonChecked(hwndDlg,IDC_STATUS) || IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE)));
- EnableWindow(GetDlgItem(hwndDlg,IDC_SHOW_STATUS_IF_NOAWAY), IsDlgButtonChecked(hwndDlg,IDC_SHOW) && (IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE)));
- EnableWindow(GetDlgItem(hwndDlg,IDC_SHOW_LISTENING_IF_NOAWAY), IsDlgButtonChecked(hwndDlg,IDC_SHOW) && (IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE)));
+ EnableWindow(GetDlgItem(hwndDlg,IDC_SHOW_STATUS_IF_NOAWAY), IsDlgButtonChecked(hwndDlg,IDC_SHOW) && (IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE)));
+ EnableWindow(GetDlgItem(hwndDlg,IDC_SHOW_LISTENING_IF_NOAWAY), IsDlgButtonChecked(hwndDlg,IDC_SHOW) && (IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE)));
}
else if (LOWORD(wParam) == IDC_SHOW) {
BOOL enabled = IsDlgButtonChecked(hwndDlg,IDC_SHOW);
@@ -879,9 +881,9 @@ static INT_PTR CALLBACK DlgProcItemThirdLineOpts(HWND hwndDlg, UINT msg, WPARAM EnableWindow(GetDlgItem(hwndDlg,IDC_VARIABLE_TEXT), enabled && IsDlgButtonChecked(hwndDlg,IDC_TEXT));
EnableWindow(GetDlgItem(hwndDlg,IDC_VARIABLES_L), enabled && IsDlgButtonChecked(hwndDlg,IDC_TEXT));
- EnableWindow(GetDlgItem(hwndDlg,IDC_XSTATUS_HAS_PRIORITY), enabled && (IsDlgButtonChecked(hwndDlg,IDC_STATUS)
+ EnableWindow(GetDlgItem(hwndDlg,IDC_XSTATUS_HAS_PRIORITY), enabled && (IsDlgButtonChecked(hwndDlg,IDC_STATUS)
|| IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE)));
- EnableWindow(GetDlgItem(hwndDlg,IDC_USE_NAME_AND_MESSAGE), enabled && (IsDlgButtonChecked(hwndDlg,IDC_STATUS)
+ EnableWindow(GetDlgItem(hwndDlg,IDC_USE_NAME_AND_MESSAGE), enabled && (IsDlgButtonChecked(hwndDlg,IDC_STATUS)
|| IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE)));
EnableWindow(GetDlgItem(hwndDlg,IDC_SHOW_STATUS_IF_NOAWAY), enabled && IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE));
EnableWindow(GetDlgItem(hwndDlg,IDC_SHOW_LISTENING_IF_NOAWAY), enabled && IsDlgButtonChecked(hwndDlg,IDC_STATUS_MESSAGE));
@@ -949,7 +951,7 @@ struct int id; // Dialog id
DLGPROC wnd_proc; // Dialog function
}
-static row_opt_items[] =
+static row_opt_items[] =
{
{ LPGEN("Row"), IDD_OPT_ITEM_ROW, DlgProcItemRowOpts },
#ifdef _DEBUG
diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp index 77464992ef..45088d09c2 100644 --- a/plugins/Clist_modern/src/modern_clistsettings.cpp +++ b/plugins/Clist_modern/src/modern_clistsettings.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_clist.h"
#include "hdr/modern_commonprototypes.h"
@@ -78,10 +80,10 @@ void FreeDisplayNameCache() mir_free_and_nil( clistCache->items[i] );
}
- List_Destroy( clistCache );
+ List_Destroy( clistCache );
mir_free(clistCache);
clistCache = NULL;
- }
+ }
}
ClcCacheEntry* cliGetCacheEntry(HANDLE hContact)
@@ -89,8 +91,8 @@ ClcCacheEntry* cliGetCacheEntry(HANDLE hContact) if ( !clistCache) return NULL;
int idx;
- ClcCacheEntry *p;
- if ( !List_GetIndex( clistCache, &hContact, &idx )) {
+ ClcCacheEntry *p;
+ if ( !List_GetIndex( clistCache, &hContact, &idx )) {
if (( p = pcli->pfnCreateCacheItem( hContact )) != NULL ) {
List_Insert( clistCache, p, idx );
pcli->pfnInvalidateDisplayNameCacheEntry( hContact );
@@ -114,7 +116,7 @@ void CListSettings_FreeCacheItemDataOption( ClcCacheEntry *pDst, DWORD flag ) if ( flag & CCI_NAME)
pDst->freeName();
- if ( flag & CCI_GROUP )
+ if ( flag & CCI_GROUP )
mir_free_and_nil(pDst->tszGroup);
if ( flag & CCI_LINES ) {
@@ -145,11 +147,11 @@ void CListSettings_CopyCacheItems(ClcCacheEntry *pDst, ClcCacheEntry *pSrc, DWOR if ( flag & CCI_GROUP ) pDst->tszGroup = mir_tstrdup(pSrc->tszGroup);
if ( flag & CCI_PROTO ) pDst->m_cache_cszProto = pSrc->m_cache_cszProto;
if ( flag & CCI_STATUS ) pDst->m_cache_nStatus = pSrc->m_cache_nStatus;
-
+
if ( flag & CCI_LINES ) {
mir_free( pDst->szThirdLineText );
pDst->szThirdLineText = mir_tstrdup( pSrc->szThirdLineText );
-
+
mir_free( pDst->szSecondLineText );
pDst->szSecondLineText = mir_tstrdup( pSrc->szSecondLineText );
@@ -157,7 +159,7 @@ void CListSettings_CopyCacheItems(ClcCacheEntry *pDst, ClcCacheEntry *pSrc, DWOR pDst->ssSecondLine = pSrc->ssSecondLine;
}
- if ( flag & CCI_TIME)
+ if ( flag & CCI_TIME)
pDst->hTimeZone = pSrc->hTimeZone;
if ( flag & CCI_OTHER) {
@@ -217,7 +219,7 @@ void cliCheckCacheItem(ClcCacheEntry *pdnce) {
if (pdnce == NULL)
return;
-
+
if (pdnce->hContact == NULL) { //selfcontact
if ( !pdnce->tszName)
pdnce->getName();
@@ -226,7 +228,7 @@ void cliCheckCacheItem(ClcCacheEntry *pdnce) if (pdnce->m_cache_cszProto == NULL && pdnce->m_cache_bProtoNotExists == FALSE) {
pdnce->m_cache_cszProto = GetProtoForContact(pdnce->hContact);
- if (pdnce->m_cache_cszProto == NULL)
+ if (pdnce->m_cache_cszProto == NULL)
pdnce->m_cache_bProtoNotExists = FALSE;
else if (pdnce->m_cache_cszProto && pdnce->tszName)
pdnce->freeName();
@@ -237,7 +239,7 @@ void cliCheckCacheItem(ClcCacheEntry *pdnce) else if (pdnce->isUnknown && pdnce->m_cache_cszProto && pdnce->m_cache_bProtoNotExists == TRUE && g_flag_bOnModulesLoadedCalled) {
if (CallService(MS_PROTO_ISPROTOCOLLOADED, 0, (LPARAM)pdnce->m_cache_cszProto) == 0) {
- pdnce->m_cache_bProtoNotExists = FALSE;
+ pdnce->m_cache_bProtoNotExists = FALSE;
pdnce->getName();
}
}
@@ -283,10 +285,10 @@ void cliCheckCacheItem(ClcCacheEntry *pdnce) void IvalidateDisplayNameCache(DWORD mode)
{
- if ( clistCache != NULL )
+ if ( clistCache != NULL )
{
int i;
- for ( i=0; i < clistCache->realCount; i++)
+ for ( i=0; i < clistCache->realCount; i++)
{
ClcCacheEntry *pdnce = (ClcCacheEntry *)clistCache->items[i];
if (mode&16)
@@ -301,7 +303,7 @@ void InvalidateDNCEbyPointer(HANDLE hContact, ClcCacheEntry *pdnce, int SettingT {
if (hContact == NULL || pdnce == NULL)
return;
-
+
if (SettingType == 16) {
pdnce->ssSecondLine.DestroySmileyList();
mir_free_and_nil(pdnce->szSecondLineText);
@@ -322,7 +324,7 @@ void InvalidateDNCEbyPointer(HANDLE hContact, ClcCacheEntry *pdnce, int SettingT return;
}
- if (SettingType == -1 || SettingType == DBVT_DELETED) {
+ if (SettingType == -1 || SettingType == DBVT_DELETED) {
pdnce->freeName();
mir_free_and_nil(pdnce->tszGroup);
pdnce->m_cache_cszProto = NULL;
@@ -366,7 +368,7 @@ void ClcCacheEntry::freeName() {
if ( !isUnknown)
mir_free(tszName);
- else
+ else
isUnknown = false;
tszName = NULL;
}
@@ -447,23 +449,23 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam) if ( !mir_strcmp(cws->szSetting, "Status") || wildcmp(cws->szSetting, "Status?")) {
if (g_szMetaModuleName && !mir_strcmp(cws->szModule,g_szMetaModuleName) && mir_strcmp(cws->szSetting, "Status")) {
int res = 0;
- if (pcli->hwndContactTree && g_flag_bOnModulesLoadedCalled)
+ if (pcli->hwndContactTree && g_flag_bOnModulesLoadedCalled)
res = PostAutoRebuidMessage(pcli->hwndContactTree);
if ((db_get_w(NULL,"CList","SecondLineType",SETTING_SECONDLINE_TYPE_DEFAULT) == TEXT_STATUS_MESSAGE || db_get_w(NULL,"CList","ThirdLineType",SETTING_THIRDLINE_TYPE_DEFAULT) == TEXT_STATUS_MESSAGE) && pdnce->hContact && pdnce->m_cache_cszProto)
- amRequestAwayMsg(hContact);
+ amRequestAwayMsg(hContact);
return 0;
}
- if (pdnce->bIsHidden != 1) {
+ if (pdnce->bIsHidden != 1) {
pdnce___SetStatus( pdnce , cws->value.wVal ); //dont use direct set
if (cws->value.wVal == ID_STATUS_OFFLINE)
if (g_CluiData.bRemoveAwayMessageForOffline)
db_set_s(hContact,"CList","StatusMsg","");
if ((db_get_w(NULL,"CList","SecondLineType",0) == TEXT_STATUS_MESSAGE || db_get_w(NULL,"CList","ThirdLineType",0) == TEXT_STATUS_MESSAGE) && pdnce->hContact && pdnce->m_cache_cszProto)
- amRequestAwayMsg(hContact);
+ amRequestAwayMsg(hContact);
pcli->pfnClcBroadcast(INTM_STATUSCHANGED, wParam, 0);
cli_ChangeContactIcon(hContact, pcli->pfnIconFromStatusMode(cws->szModule, cws->value.wVal, hContact), 0); //by FYR
@@ -486,28 +488,28 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam) else if (pdnce->tszName == NULL || !strcmp(cws->szSetting,"MyHandle"))
InvalidateDNCEbyPointer(hContact,pdnce,cws->value.type);
- else if ( !strcmp(cws->szSetting,"Group"))
+ else if ( !strcmp(cws->szSetting,"Group"))
InvalidateDNCEbyPointer(hContact,pdnce,cws->value.type);
else if ( !strcmp(cws->szSetting,"Hidden")) {
- InvalidateDNCEbyPointer(hContact,pdnce,cws->value.type);
+ InvalidateDNCEbyPointer(hContact,pdnce,cws->value.type);
if (cws->value.type == DBVT_DELETED || cws->value.bVal == 0) {
char *szProto = GetContactProto((HANDLE)wParam);
- cli_ChangeContactIcon(hContact,pcli->pfnIconFromStatusMode(szProto,
+ cli_ChangeContactIcon(hContact,pcli->pfnIconFromStatusMode(szProto,
szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact,szProto,"Status",ID_STATUS_OFFLINE), hContact),1); //by FYR
}
pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);
}
else if ( !strcmp(cws->szSetting,"noOffline")) {
- InvalidateDNCEbyPointer(hContact,pdnce,cws->value.type);
+ InvalidateDNCEbyPointer(hContact,pdnce,cws->value.type);
pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);
}
}
else if ( !strcmp(cws->szModule,"Protocol")) {
if ( !strcmp(cws->szSetting,"p")) {
- InvalidateDNCEbyPointer(hContact,pdnce,cws->value.type);
+ InvalidateDNCEbyPointer(hContact,pdnce,cws->value.type);
char *szProto = (cws->value.type == DBVT_DELETED) ? NULL : cws->value.pszVal;
- cli_ChangeContactIcon(hContact,pcli->pfnIconFromStatusMode(szProto,
+ cli_ChangeContactIcon(hContact,pcli->pfnIconFromStatusMode(szProto,
szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact,szProto,"Status",ID_STATUS_OFFLINE), hContact), 0);
}
}
diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp index 7d463c2307..c772af7186 100644 --- a/plugins/Clist_modern/src/modern_clisttray.cpp +++ b/plugins/Clist_modern/src/modern_clisttray.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include <m_clui.h>
#include "hdr/modern_clist.h"
@@ -100,7 +102,7 @@ INT_PTR CListTray_GetGlobalStatus(WPARAM wparam,LPARAM lparam) for (i=0; i < pcli->hClcProtoCount; i++)
{
if ( !pcli->pfnGetProtocolVisibility(pcli->clcProto[i].szProto)) continue;
- if (pcli->clcProto[i].dwStatus >= ID_STATUS_CONNECTING &&
+ if (pcli->clcProto[i].dwStatus >= ID_STATUS_CONNECTING &&
pcli->clcProto[i].dwStatus < ID_STATUS_CONNECTING+MAX_CONNECT_RETRIES)
{
connectingCount++;
@@ -180,7 +182,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int averageMode, int netProto if (g_bMultiConnectionMode) {
if (_strcmpi(szChangedProto, g_szConnectingProto))
return -1;
-
+
hIcon = (HICON)CLUI_GetConnectingIconService(NULL, 1);
}
else hIcon = (HICON)CLUI_GetConnectingIconService((WPARAM)szChangedProto,0);
@@ -225,7 +227,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int averageMode, int netProto else if ( db_get_b(NULL,"CList","AlwaysMulti",SETTING_ALWAYSMULTI_DEFAULT )) {
if ( !pcli->pfnGetProtocolVisibility(szChangedProto))
return -1;
-
+
status = CallProtoService(szChangedProto,PS_GETSTATUS, 0, 0);
if ((g_StatusBarData.connectingIcon == 1) && status >= ID_STATUS_CONNECTING && status <= ID_STATUS_CONNECTING+MAX_CONNECT_RETRIES)
hIcon = (HICON)CLUI_GetConnectingIconService((WPARAM)szChangedProto, 0);
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index 1162209f6b..5f5e087734 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -1,13 +1,12 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
-
listed in contributors.txt.
-
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
@@ -96,13 +95,13 @@ static RECT rcNewWindowRect={0}, static HANDLE hFrameContactTree;
-static PROTOTICKS CycleStartTick[64]={0};//max 64 protocols
+static PROTOTICKS CycleStartTick[64]={0};//max 64 protocols
static int nAnimatedIconStep=100;
HIMAGELIST hAvatarOverlays=NULL;
-OVERLAYICONINFO g_pAvatarOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE + 1] =
+OVERLAYICONINFO g_pAvatarOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE + 1] =
{
{ "AVATAR_OVERLAY_OFFLINE", LPGEN("Offline"), IDI_AVATAR_OVERLAY_OFFLINE, -1},
{ "AVATAR_OVERLAY_ONLINE", LPGEN("Online"), IDI_AVATAR_OVERLAY_ONLINE, -1},
@@ -116,7 +115,7 @@ OVERLAYICONINFO g_pAvatarOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE + { "AVATAR_OVERLAY_LUNCH", LPGEN("Out to lunch"), IDI_AVATAR_OVERLAY_LUNCH, -1}
};
-OVERLAYICONINFO g_pStatusOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE + 1] =
+OVERLAYICONINFO g_pStatusOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE + 1] =
{
{ "STATUS_OVERLAY_OFFLINE", LPGEN("Offline"), IDI_STATUS_OVERLAY_OFFLINE, -1},
{ "STATUS_OVERLAY_ONLINE", LPGEN("Online"), IDI_STATUS_OVERLAY_ONLINE, -1},
@@ -809,7 +808,7 @@ int CLUI_UpdateTimer(BYTE BringIn) KillTimer(pcli->hwndContactList,TM_BRINGOUTTIMEOUT);
CLUI_SafeSetTimer(pcli->hwndContactList,TM_BRINGOUTTIMEOUT,wBehindEdgeHideDelay*100, NULL);
}
-
+
if (bShowEventStarted == 0 && g_CluiData.nBehindEdgeState > 0) {
KillTimer(pcli->hwndContactList,TM_BRINGINTIMEOUT);
bShowEventStarted = (BOOL)CLUI_SafeSetTimer(pcli->hwndContactList,TM_BRINGINTIMEOUT,wBehindEdgeShowDelay*100, NULL);
@@ -976,7 +975,7 @@ static HICON CLUI_LoadIconFromExternalFile(TCHAR *filename, int i) TCHAR szPath[MAX_PATH], szFullPath[MAX_PATH];
mir_sntprintf(szPath, SIZEOF(szPath), _T("Icons\\%s"), filename);
PathToAbsoluteT(szPath, szFullPath);
-
+
HICON hIcon = NULL;
ExtractIconEx(szFullPath, i, NULL, &hIcon, 1);
return hIcon;
@@ -1595,7 +1594,7 @@ BOOL CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect, BOOL bErase) g_flag_bFullRepaint = 1;
return 0;
}
-
+
return InvalidateRect(hWnd,lpRect,bErase);
}
@@ -1628,7 +1627,7 @@ HANDLE RegisterIcolibIconHandle(char *szIcoID, char *szSectionName, char *szDes if ( !FileExists(fileFull))
fileFull[0] = _T('\0');
}
-
+
if (fileFull[0] != _T('\0'))
sid.iDefaultIndex = -iDefaultIndex;
else {
@@ -2624,7 +2623,7 @@ LRESULT CLUI::OnDrawItem(UINT msg, WPARAM wParam, LPARAM lParam) }
return TRUE;
}
-
+
if (dis->itemData == MENU_STATUSMENU) {
if ( !g_CluiData.fLayered) {
char buf[255] = {0};
@@ -2651,7 +2650,7 @@ LRESULT CLUI::OnDrawItem(UINT msg, WPARAM wParam, LPARAM lParam) }
return TRUE;
}
-
+
if (dis->itemData == MENU_MINIMIZE && !g_CluiData.fLayered) {
//TODO check if caption is visible
char buf[255] = {0};
diff --git a/plugins/Clist_modern/src/modern_cluiservices.cpp b/plugins/Clist_modern/src/modern_cluiservices.cpp index 2203f713e7..69b5e6b247 100644 --- a/plugins/Clist_modern/src/modern_cluiservices.cpp +++ b/plugins/Clist_modern/src/modern_cluiservices.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_commonprototypes.h"
@@ -49,4 +51,3 @@ int CLUIServices_LoadModule(void) CreateServiceFunction(MS_CLIST_GETSTATUSMODE,CListTray_GetGlobalStatus);
return 0;
}
-
diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp index fdf0191a84..eccb4e0bab 100644 --- a/plugins/Clist_modern/src/modern_contact.cpp +++ b/plugins/Clist_modern/src/modern_contact.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,12 +21,13 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include "m_clui.h"
#include "hdr/modern_clist.h"
#include "hdr/modern_commonprototypes.h"
-struct
+struct
{
int m_cache_nStatus,order;
} statusModeOrder[] = {
@@ -81,7 +83,7 @@ int GetProtoIndex(char * szName) if (szName) {
PROTOACCOUNT **accs = NULL;
int accCount = 0;
- ProtoEnumAccounts( &accCount, &accs );
+ ProtoEnumAccounts( &accCount, &accs );
for (int i=0; i < accCount; i++)
if ( !mir_strcmpi(szName, accs[i]->szModuleName))
@@ -125,23 +127,23 @@ int CompareContacts2(const ClcContact *contact1,const ClcContact *contact2, int return 2*(statusa == ID_STATUS_OFFLINE)-1;
}
- if (by == SORTBY_NAME)
+ if (by == SORTBY_NAME)
{ //name
return mir_tstrcmpi(namea,nameb);
- }
- if (by == SORTBY_NAME_LOCALE)
+ }
+ if (by == SORTBY_NAME_LOCALE)
{ //name
static int LocaleId = -1;
if (LocaleId == -1) LocaleId = CallService(MS_LANGPACK_GETLOCALE, 0, 0);
return (CompareString(LocaleId,NORM_IGNORECASE,SAFETSTRING(namea),-1,SAFETSTRING(nameb),-1))-2;
- }
- else if (by == SORTBY_LASTMSG)
+ }
+ else if (by == SORTBY_LASTMSG)
{ //last message
DWORD ta = CompareContacts2_getLMTime(a);
DWORD tb = CompareContacts2_getLMTime(b);
return tb-ta;
- }
- else if (by == SORTBY_PROTO)
+ }
+ else if (by == SORTBY_PROTO)
{
int rc = GetProtoIndex(szProto1)-GetProtoIndex(szProto2);
@@ -156,7 +158,7 @@ int CompareContacts2(const ClcContact *contact1,const ClcContact *contact2, int int cliCompareContacts(const ClcContact *contact1,const ClcContact *contact2)
{
int i, r;
- for (i=0; i < SIZEOF(g_CluiData.bSortByOrder); i++)
+ for (i=0; i < SIZEOF(g_CluiData.bSortByOrder); i++)
{
r = CompareContacts2(contact1, contact2, g_CluiData.bSortByOrder[i]);
if (r != 0)
@@ -181,7 +183,7 @@ INT_PTR ToggleGroups(WPARAM wParam,LPARAM lParam) }
INT_PTR SetUseGroups(WPARAM wParam, LPARAM lParam)
-{
+{
int newVal = !(GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_USEGROUPS);
if ( wParam != -1 )
{
diff --git a/plugins/Clist_modern/src/modern_docking.cpp b/plugins/Clist_modern/src/modern_docking.cpp index 24ed62d9f9..85dfc20632 100644 --- a/plugins/Clist_modern/src/modern_docking.cpp +++ b/plugins/Clist_modern/src/modern_docking.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_clist.h"
#include "m_api/m_skin_eng.h"
@@ -103,14 +105,14 @@ int Docking_ProcessWindowMessage(WPARAM wParam,LPARAM lParam) static int draggingTitle;
MSG *msg = (MSG*)wParam;
- if (msg->message == WM_DESTROY)
+ if (msg->message == WM_DESTROY)
db_set_b(NULL,"CList","Docked",(BYTE)g_CluiData.fDocked);
if ( !g_CluiData.fDocked && msg->message != WM_CREATE && msg->message != WM_MOVING && msg->message != WM_CREATEDOCKED && msg->message != WM_MOVE && msg->message != WM_SIZE) return 0;
switch(msg->message) {
case WM_CREATE:
//if (GetSystemMetrics(SM_CMONITORS)>1) return 0;
- if ( db_get_b(NULL,"CList","Docked",0) && db_get_b(NULL,"CLUI","DockToSides",SETTING_DOCKTOSIDES_DEFAULT))
+ if ( db_get_b(NULL,"CList","Docked",0) && db_get_b(NULL,"CLUI","DockToSides",SETTING_DOCKTOSIDES_DEFAULT))
{
PostMessage(msg->hwnd,WM_CREATEDOCKED, 0, 0);
}
@@ -180,7 +182,7 @@ int Docking_ProcessWindowMessage(WPARAM wParam,LPARAM lParam) dock_drag_dy = rcWindow.top-ptCursor.y;
Docking_GetMonitorRectFromPoint(ptCursor,&rcMonitor);
- if (((ptCursor.x < rcMonitor.left+EDGESENSITIVITY)
+ if (((ptCursor.x < rcMonitor.left+EDGESENSITIVITY)
|| (ptCursor.x >= rcMonitor.right-EDGESENSITIVITY))
&& db_get_b(NULL,"CLUI","DockToSides",SETTING_DOCKTOSIDES_DEFAULT))
{
@@ -192,7 +194,7 @@ int Docking_ProcessWindowMessage(WPARAM wParam,LPARAM lParam) SHAppBarMessage(ABM_NEW,&abd);
if (ptCursor.x < rcMonitor.left+EDGESENSITIVITY) g_CluiData.fDocked = DOCKED_LEFT;
else g_CluiData.fDocked = DOCKED_RIGHT;
- // TempDock = 1;
+ // TempDock = 1;
GetWindowRect(msg->hwnd,(LPRECT)msg->lParam);
rc = (RECT*)msg->lParam;
if (g_CluiData.fDocked == DOCKED_RIGHT)
@@ -201,7 +203,7 @@ int Docking_ProcessWindowMessage(WPARAM wParam,LPARAM lParam) dx = (rc->left < rcMonitor.left)?rc->left-rcMonitor.left:0;
OffsetRect(rc,-dx,0);
Docking_AdjustPosition(msg->hwnd,(LPRECT)&rcMonitor,(LPRECT)msg->lParam);
- SendMessage(msg->hwnd,WM_SIZE, 0, 0);
+ SendMessage(msg->hwnd,WM_SIZE, 0, 0);
g_CluiData.mutexPreventDockMoving = 0;
Sync(CLUIFrames_OnMoving,msg->hwnd,(LPRECT)msg->lParam);
g_CluiData.mutexPreventDockMoving = 1;
@@ -224,8 +226,8 @@ int Docking_ProcessWindowMessage(WPARAM wParam,LPARAM lParam) g_CluiData.mutexPreventDockMoving = 0;
SetWindowPos(msg->hwnd, 0, rcWindow.left,rcWindow.top, 0, 0, SWP_NOSIZE|SWP_NOZORDER|SWP_NOREDRAW|SWP_NOSENDCHANGING);
Sync(CLUIFrames_OnMoving,msg->hwnd,&rcWindow);
- ModernSkinButton_ReposButtons( msg->hwnd, SBRF_DO_NOT_DRAW, NULL );// -= -= -=
- g_CluiData.mutexPreventDockMoving = 1;
+ ModernSkinButton_ReposButtons( msg->hwnd, SBRF_DO_NOT_DRAW, NULL );// -= -= -=
+ g_CluiData.mutexPreventDockMoving = 1;
return 1;
}
@@ -248,7 +250,7 @@ int Docking_ProcessWindowMessage(WPARAM wParam,LPARAM lParam) rc = *(RECT*)(msg->lParam);
g_CluiData.mutexPreventDockMoving = 0;
Sync(CLUIFrames_OnMoving,msg->hwnd,&rc);
- // -= -= -=
+ // -= -= -=
return TRUE;
}
case WM_SHOWWINDOW:
@@ -269,7 +271,7 @@ int Docking_ProcessWindowMessage(WPARAM wParam,LPARAM lParam) Docking_AdjustPosition(msg->hwnd,&rcMonitor,&rc);
MoveWindow(msg->hwnd,rc.left,rc.top,rc.right-rc.left,rc.bottom-rc.top,FALSE);
Sync(CLUIFrames_OnMoving,msg->hwnd,&rc);
- ModernSkinButton_ReposButtons(msg->hwnd, SBRF_DO_NOT_DRAW,NULL);// -= -= -=
+ ModernSkinButton_ReposButtons(msg->hwnd, SBRF_DO_NOT_DRAW,NULL);// -= -= -=
}
else {
SHAppBarMessage(ABM_REMOVE,&abd);
@@ -279,7 +281,7 @@ int Docking_ProcessWindowMessage(WPARAM wParam,LPARAM lParam) case WM_NCHITTEST:
{ LONG result;
result = DefWindowProc(msg->hwnd,WM_NCHITTEST,msg->wParam,msg->lParam);
- if (result == HTSIZE || result == HTTOP || result == HTTOPLEFT || result == HTTOPRIGHT ||
+ if (result == HTSIZE || result == HTTOP || result == HTTOPLEFT || result == HTTOPRIGHT ||
result == HTBOTTOM || result == HTBOTTOMRIGHT || result == HTBOTTOMLEFT) {*((LRESULT*)lParam) = HTCLIENT; return TRUE;}
if (g_CluiData.fDocked == DOCKED_LEFT && result == HTLEFT) {*((LRESULT*)lParam) = HTCLIENT; return TRUE;}
if (g_CluiData.fDocked == DOCKED_RIGHT && result == HTRIGHT) {*((LRESULT*)lParam) = HTCLIENT; return TRUE;}
@@ -300,7 +302,7 @@ int Docking_ProcessWindowMessage(WPARAM wParam,LPARAM lParam) { RECT rc;
POINT pt;
GetClientRect(msg->hwnd,&rc);
- if (((g_CluiData.fDocked == DOCKED_LEFT || g_CluiData.fDocked == -DOCKED_LEFT) && (short)LOWORD(msg->lParam)>rc.right) ||
+ if (((g_CluiData.fDocked == DOCKED_LEFT || g_CluiData.fDocked == -DOCKED_LEFT) && (short)LOWORD(msg->lParam)>rc.right) ||
((g_CluiData.fDocked == DOCKED_RIGHT || g_CluiData.fDocked == -DOCKED_RIGHT) && (short)LOWORD(msg->lParam) < 0)) {
ReleaseCapture();
draggingTitle = 0;
@@ -333,7 +335,7 @@ int Docking_ProcessWindowMessage(WPARAM wParam,LPARAM lParam) Docking_GetMonitorRectFromWindow(msg->hwnd,&rcMonitor);
GetWindowRect(msg->hwnd,&rc);
Docking_AdjustPosition(msg->hwnd,&rcMonitor,&rc);
- Sync(CLUIFrames_OnMoving,msg->hwnd,&rc); // -= -= -=
+ Sync(CLUIFrames_OnMoving,msg->hwnd,&rc); // -= -= -=
ModernSkinButton_ReposButtons(msg->hwnd, SBRF_DO_NOT_DRAW, NULL);
g_CluiData.mutexPreventDockMoving = 1;
diff --git a/plugins/Clist_modern/src/modern_gettextasync.cpp b/plugins/Clist_modern/src/modern_gettextasync.cpp index 4c4bbe5b89..bc1f732520 100644 --- a/plugins/Clist_modern/src/modern_gettextasync.cpp +++ b/plugins/Clist_modern/src/modern_gettextasync.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -19,7 +20,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
*/
/*
@@ -83,7 +83,7 @@ static void gtaThreadProc(void *lpParam) SHORTDATA data = {0};
while (!MirandaExiting()) {
- Sync(CLUI_SyncGetShortData,(WPARAM)pcli->hwndContactTree,(LPARAM)&data);
+ Sync(CLUI_SyncGetShortData,(WPARAM)pcli->hwndContactTree,(LPARAM)&data);
while (true) {
if ( MirandaExiting())
return;
@@ -98,8 +98,8 @@ static void gtaThreadProc(void *lpParam) SHORTDATA *dat;
if (mpChain.dat == NULL || (!IsBadReadPtr(mpChain.dat,sizeof(mpChain.dat)) && mpChain.dat->hWnd == data.hWnd))
dat = &data;
- else {
- Sync(CLUI_SyncGetShortData,(WPARAM)mpChain.dat->hWnd,(LPARAM)&dat2);
+ else {
+ Sync(CLUI_SyncGetShortData,(WPARAM)mpChain.dat->hWnd,(LPARAM)&dat2);
dat = &dat2;
}
if ( MirandaExiting())
@@ -111,7 +111,7 @@ static void gtaThreadProc(void *lpParam) if ( !Sync(CLUI_SyncGetPDNCE, (WPARAM) 0, (LPARAM)&cacheEntry)) {
Cache_GetSecondLineText(dat, &cacheEntry);
Cache_GetThirdLineText(dat, &cacheEntry);
- Sync(CLUI_SyncSetPDNCE, (WPARAM) CCI_LINES,(LPARAM)&cacheEntry);
+ Sync(CLUI_SyncSetPDNCE, (WPARAM) CCI_LINES,(LPARAM)&cacheEntry);
CListSettings_FreeCacheItemData(&cacheEntry);
}
@@ -137,18 +137,18 @@ BOOL gtaWakeThread() int gtaAddRequest(ClcData *dat,ClcContact *contact,HANDLE hContact)
{
if (MirandaExiting()) return 0;
- gtalock;
+ gtalock;
{
GTACHAINITEM * mpChain = (GTACHAINITEM *)malloc(sizeof(GTACHAINITEM));
mpChain->hContact = hContact;
mpChain->dat = dat;
mpChain->Next = NULL;
- if (gtaLastItem)
+ if (gtaLastItem)
{
gtaLastItem->Next = (GTACHAINITEM *)mpChain;
gtaLastItem = mpChain;
}
- else
+ else
{
gtaFirstItem = mpChain;
gtaLastItem = mpChain;
diff --git a/plugins/Clist_modern/src/modern_global.cpp b/plugins/Clist_modern/src/modern_global.cpp index 269abb136e..d20efc2e33 100644 --- a/plugins/Clist_modern/src/modern_global.cpp +++ b/plugins/Clist_modern/src/modern_global.cpp @@ -1,13 +1,12 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Miranda NG: the free IM client for Microsoft* Windows*
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
-
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
diff --git a/plugins/Clist_modern/src/modern_image_array.cpp b/plugins/Clist_modern/src/modern_image_array.cpp index 0798f9a993..221c61813f 100644 --- a/plugins/Clist_modern/src/modern_image_array.cpp +++ b/plugins/Clist_modern/src/modern_image_array.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -21,8 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Created by Pescuma
-
*/
+
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_image_array.h"
#include "hdr/modern_commonprototypes.h"
@@ -45,7 +46,7 @@ static BOOL ImageArray_Alloc(LP_IMAGE_ARRAY_DATA iad, int size) if (iad->nodes != NULL)
{
- IMAGE_ARRAY_DATA_NODE *tmp = (IMAGE_ARRAY_DATA_NODE *) realloc((void *)iad->nodes,
+ IMAGE_ARRAY_DATA_NODE *tmp = (IMAGE_ARRAY_DATA_NODE *) realloc((void *)iad->nodes,
sizeof(IMAGE_ARRAY_DATA_NODE) * size_grow);
if (tmp == NULL)
@@ -115,7 +116,7 @@ void ImageArray_Initialize(LP_IMAGE_ARRAY_DATA iad, BOOL width_based, int grow_s {
iad->grow_step = 1;
}
- iad->hdc = CreateCompatibleDC(NULL);
+ iad->hdc = CreateCompatibleDC(NULL);
iad->img = NULL;
iad->width = 0;
@@ -143,7 +144,7 @@ HBITMAP ImageArray_Free(LP_IMAGE_ARRAY_DATA iad, BOOL keep_bitmap) iad->height = 0;
}
- if (iad->nodes != NULL)
+ if (iad->nodes != NULL)
{
free(iad->nodes);
iad->nodes = NULL;
@@ -171,7 +172,7 @@ void ImageArray_Clear(LP_IMAGE_ARRAY_DATA iad) iad->height = 0;
}
- if (iad->nodes != NULL)
+ if (iad->nodes != NULL)
{
free(iad->nodes);
iad->nodes = NULL;
@@ -237,7 +238,7 @@ int ImageArray_AddImage(LP_IMAGE_ARRAY_DATA iad, HBITMAP hBmp, int pos) LeaveCriticalSection(&iad->cs);
return -1;
}
-
+
// Alloc array
if ( !ImageArray_Alloc(iad, iad->nodes_size + 1))
{
@@ -250,7 +251,7 @@ int ImageArray_AddImage(LP_IMAGE_ARRAY_DATA iad, HBITMAP hBmp, int pos) // Set some draw states
SelectObject(iad->hdc, hNewBmp);
- hdc_old = CreateCompatibleDC(iad->hdc);
+ hdc_old = CreateCompatibleDC(iad->hdc);
old_bmp = (HBITMAP)GetCurrentObject(hdc_old, OBJ_BITMAP);
SetBkMode(iad->hdc,TRANSPARENT);
@@ -407,12 +408,12 @@ BOOL ImageArray_ChangeImage(LP_IMAGE_ARRAY_DATA iad, HBITMAP hBmp, int pos) LeaveCriticalSection(&iad->cs);
return FALSE;
}
-
+
// Move image...
// Set some draw states
SelectObject(iad->hdc, hNewBmp);
- hdc_old = CreateCompatibleDC(iad->hdc);
+ hdc_old = CreateCompatibleDC(iad->hdc);
SetBkMode(iad->hdc, TRANSPARENT);
{
@@ -552,12 +553,12 @@ BOOL ImageArray_RemoveImage(LP_IMAGE_ARRAY_DATA iad, int pos) LeaveCriticalSection(&iad->cs);
return FALSE;
}
-
+
// Move image...
// Set some draw states
SelectObject(iad->hdc, hNewBmp);
- hdc_old = CreateCompatibleDC(iad->hdc);
+ hdc_old = CreateCompatibleDC(iad->hdc);
SetBkMode(iad->hdc, TRANSPARENT);
{
diff --git a/plugins/Clist_modern/src/modern_keyboard.cpp b/plugins/Clist_modern/src/modern_keyboard.cpp index 857f89f4e1..4cc0cb54f2 100644 --- a/plugins/Clist_modern/src/modern_keyboard.cpp +++ b/plugins/Clist_modern/src/modern_keyboard.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include <m_hotkeys.h>
diff --git a/plugins/Clist_modern/src/modern_newrowopts.cpp b/plugins/Clist_modern/src/modern_newrowopts.cpp index 15bb235bea..adf97e27d8 100644 --- a/plugins/Clist_modern/src/modern_newrowopts.cpp +++ b/plugins/Clist_modern/src/modern_newrowopts.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -28,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /************************************************************************/
/********* New row design options file handle ********/
/************************************************************************/
-
+
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_clist.h"
@@ -37,7 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define COLUMNS_PLACE 254
#define ROWS_PLACE 253
-typedef struct _NodeList
+typedef struct _NodeList
{
BYTE bType;
int pData;
@@ -51,7 +52,7 @@ NodeList * RootNode = NULL; NodeList * AddNode(NodeList * Parent)
{
NodeList * res;
- if ( !Parent)
+ if ( !Parent)
{
res = (NodeList *)mir_alloc(sizeof(NodeList));
memset(res, 0, sizeof(NodeList));
@@ -92,11 +93,11 @@ BOOL RemoveNode(NodeList * FromList) for (k = 0;k < FromList->itemParent->AllocatedChilds;k++)
if (&(FromList->itemParent->childNodes[k]) == FromList)
{
- BOOL res = RemoveChildNode(FromList->itemParent,k);
+ BOOL res = RemoveChildNode(FromList->itemParent,k);
return res;
}
}
- do
+ do
{
RemoveChildNode(FromList,0);
}
@@ -128,7 +129,7 @@ void TraceTreeLevel(NodeList * node) {
if (node->childNodes[i].AllocatedChilds>0)
- TraceTreeLevel(&(node->childNodes[i]));
+ TraceTreeLevel(&(node->childNodes[i]));
else
{
PrintIdent();
@@ -177,7 +178,7 @@ BOOL CALLBACK DlgProcItemNewRowOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA }
case WM_NOTIFY:
{
- switch (((LPNMHDR)lParam)->idFrom)
+ switch (((LPNMHDR)lParam)->idFrom)
{
case 0:
{
diff --git a/plugins/Clist_modern/src/modern_row.cpp b/plugins/Clist_modern/src/modern_row.cpp index 058b48f2e8..057b17b6c5 100644 --- a/plugins/Clist_modern/src/modern_row.cpp +++ b/plugins/Clist_modern/src/modern_row.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -21,7 +22,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Created by Anton Senko aka ZORG , tweaked by Artem Shpynov aka FYR
-
*/
#include "hdr/modern_commonheaders.h"
@@ -327,8 +327,8 @@ BOOL rowParse(ROWCELL* &cell, ROWCELL* parent, char *tbuf, int &hbuf, int &seque if (!_strnicmp(word, "<tr", strlen(word)) || !_strnicmp(word, "<tr>", strlen(word))) cont = TC_ROW;
else if ( !_strnicmp(word, "<tc", strlen(word)) || !_strnicmp(word, "<tc>", strlen(word))) cont = TC_COL;
- else if ( !_strnicmp(word, "/>", strlen(word)) ||
- !_strnicmp(word, "</tr>", strlen(word)) ||
+ else if ( !_strnicmp(word, "/>", strlen(word)) ||
+ !_strnicmp(word, "</tr>", strlen(word)) ||
!_strnicmp(word, "</tc>", strlen(word))) return TRUE;
else return FALSE;
diff --git a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp index c8e4e54783..2cf5cd2780 100644 --- a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp +++ b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -21,8 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Created by Pescuma, modified by Artem Shpynov
-
*/
+
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_rowheight_funcs.h"
#include "hdr/modern_commonprototypes.h"
@@ -43,7 +44,7 @@ ROWCELL * gl_RowRoot; void FreeRowCell ()
{
- if (gl_RowRoot)
+ if (gl_RowRoot)
cppDeleteTree(gl_RowRoot);
}
@@ -62,7 +63,7 @@ SIZE GetAvatarSize(int imageWidth, int imageHeight, int maxWidth, int maxHeight) if (maxWidth == 0)
maxWidth = maxHeight;
- scalefactor = min((float)maxWidth/imageWidth,(float)maxHeight/imageHeight);
+ scalefactor = min((float)maxWidth/imageWidth,(float)maxHeight/imageHeight);
sz.cx = (LONG)(imageWidth*scalefactor);
sz.cy = (LONG)(imageHeight*scalefactor);
return sz;
@@ -82,7 +83,7 @@ int mod_CalcRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, int i BYTE i=0;
int res = 0;
int height = 0;
- ClcCacheEntry *pdnce;
+ ClcCacheEntry *pdnce;
BOOL hasAvatar = FALSE;
DWORD style;
style = GetWindowLongPtr(hwnd,GWL_STYLE);
@@ -103,11 +104,11 @@ int mod_CalcRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, int i if (szCounts && szCounts[0])
tmp = max(tmp,dat->fontModernInfo[contact->group->expanded?FONTID_OPENGROUPCOUNTS:FONTID_CLOSEDGROUPCOUNTS].fontHeight);
}
- tmp = max(tmp, ICON_HEIGHT);
+ tmp = max(tmp, ICON_HEIGHT);
tmp = max(tmp,dat->row_min_heigh);
tmp += dat->row_border*2;
- if (contact->type == CLCIT_GROUP &&
- contact->group->parent->groupId == 0 &&
+ if (contact->type == CLCIT_GROUP &&
+ contact->group->parent->groupId == 0 &&
contact->group->parent->cl.items[0] != contact)
tmp += dat->row_before_group_space;
if (item != -1) dat->row_heights[item] = tmp;
@@ -138,7 +139,7 @@ int mod_CalcRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, int i if (contact->type == CLCIT_GROUP)
{
char * szCounts = pcli->pfnGetGroupCountsText(dat, contact);
- if (szCounts && strlen(szCounts)>0)
+ if (szCounts && strlen(szCounts)>0)
{
RECT count_rc = {0};
// calc width and height
@@ -210,13 +211,13 @@ int mod_CalcRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, int i DeleteDC(hdc);
}
}
- gl_RowTabAccess[i]->h = tmp;
+ gl_RowTabAccess[i]->h = tmp;
}
break;
case TC_STATUS:
- if ((contact->type == CLCIT_GROUP && !dat->row_hide_group_icon) ||
- (contact->type == CLCIT_CONTACT && contact->iImage != -1 &&
+ if ((contact->type == CLCIT_GROUP && !dat->row_hide_group_icon) ||
+ (contact->type == CLCIT_CONTACT && contact->iImage != -1 &&
!(dat->icon_hide_on_avatar && dat->avatars_show && (hasAvatar || (!hasAvatar && dat->icon_draw_on_avatar_space && contact->iImage != -1)) && !contact->image_is_special)))
{
gl_RowTabAccess[i]->h = ICON_HEIGHT;
@@ -225,8 +226,8 @@ int mod_CalcRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, int i break;
case TC_AVATAR:
- if (dat->avatars_show &&
- contact->type == CLCIT_CONTACT &&
+ if (dat->avatars_show &&
+ contact->type == CLCIT_CONTACT &&
(hasAvatar || (dat->icon_hide_on_avatar && dat->icon_draw_on_avatar_space && contact->iImage != -1)))
{
int iW = 0, iH = 0;
@@ -239,7 +240,7 @@ int mod_CalcRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, int i else if (dat->avatar_cache.nodes) {
iW = dat->avatar_cache.nodes[contact->avatar_pos].width;
iH = dat->avatar_cache.nodes[contact->avatar_pos].height;
- }
+ }
SIZE sz = GetAvatarSize(iW,iH,dat->avatars_maxwidth_size,dat->avatars_maxheight_size);
if ((sz.cx == 0 || sz.cy == 0) && dat->icon_hide_on_avatar && dat->icon_draw_on_avatar_space && contact->iImage != -1)
sz.cx = ICON_HEIGHT, sz.cy = ICON_HEIGHT;
@@ -252,7 +253,7 @@ int mod_CalcRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, int i case TC_EXTRA:
// Draw extra icons
- if (contact->type == CLCIT_CONTACT &&
+ if (contact->type == CLCIT_CONTACT &&
(!contact->isSubcontact || db_get_b(NULL,"CLC","MetaHideExtra",SETTING_METAHIDEEXTRA_DEFAULT) == 0 && dat->extraColumnsCount > 0))
{
BOOL hasExtra = FALSE;
@@ -279,7 +280,7 @@ int mod_CalcRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, int i case TC_EXTRA7:
case TC_EXTRA8:
case TC_EXTRA9:
- if (contact->type == CLCIT_CONTACT &&
+ if (contact->type == CLCIT_CONTACT &&
(!contact->isSubcontact || db_get_b(NULL,"CLC","MetaHideExtra",SETTING_METAHIDEEXTRA_DEFAULT) == 0 && dat->extraColumnsCount > 0))
{
int eNum = gl_RowTabAccess[i]->type-TC_EXTRA1;
@@ -313,7 +314,7 @@ int mod_CalcRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, int i gl_RowTabAccess[i]->w = text_size.cx;
}
}
- }
+ }
break;
}
}
@@ -396,10 +397,10 @@ BOOL RowHeights_Alloc(ClcData *dat, int size) // Calc and store max row height
static int contact_fonts[] = {
- FONTID_CONTACTS, FONTID_INVIS, FONTID_OFFLINE, FONTID_NOTONLIST, FONTID_OFFINVIS,
- FONTID_AWAY,FONTID_DND, FONTID_NA, FONTID_OCCUPIED, FONTID_CHAT, FONTID_INVISIBLE,
+ FONTID_CONTACTS, FONTID_INVIS, FONTID_OFFLINE, FONTID_NOTONLIST, FONTID_OFFINVIS,
+ FONTID_AWAY,FONTID_DND, FONTID_NA, FONTID_OCCUPIED, FONTID_CHAT, FONTID_INVISIBLE,
FONTID_PHONE, FONTID_LUNCH };
-
+
static int other_fonts[] = {FONTID_OPENGROUPS, FONTID_OPENGROUPCOUNTS,FONTID_CLOSEDGROUPS, FONTID_CLOSEDGROUPCOUNTS, FONTID_DIVIDERS, FONTID_CONTACT_TIME};
int RowHeights_GetMaxRowHeight(ClcData *dat, HWND hwnd)
@@ -417,20 +418,20 @@ int RowHeights_GetMaxRowHeight(ClcData *dat, HWND hwnd) if (dat->text_replace_smileys && dat->first_line_draw_smileys && !dat->text_resize_smileys)
tmp = max(tmp, dat->text_smiley_height);
- max_height += tmp;
+ max_height += tmp;
if (dat->second_line_show) {
tmp = dat->fontModernInfo[FONTID_SECONDLINE].fontHeight;
if (dat->text_replace_smileys && dat->second_line_draw_smileys && !dat->text_resize_smileys)
tmp = max(tmp, dat->text_smiley_height);
- max_height += dat->second_line_top_space + tmp;
+ max_height += dat->second_line_top_space + tmp;
}
if (dat->third_line_show) {
tmp = dat->fontModernInfo[FONTID_THIRDLINE].fontHeight;
if (dat->text_replace_smileys && dat->third_line_draw_smileys && !dat->text_resize_smileys)
tmp = max(tmp, dat->text_smiley_height);
- max_height += dat->third_line_top_space + tmp;
+ max_height += dat->third_line_top_space + tmp;
}
// Get other font sizes
@@ -586,16 +587,16 @@ int RowHeights_GetRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, }
// Avatar size
- if (dat->avatars_show && !dat->avatars_ignore_size_for_row_height &&
- contact->type == CLCIT_CONTACT &&
+ if (dat->avatars_show && !dat->avatars_ignore_size_for_row_height &&
+ contact->type == CLCIT_CONTACT &&
((dat->use_avatar_service && contact->avatar_data != NULL) || (!dat->use_avatar_service && contact->avatar_pos != AVATAR_POS_DONT_HAVE)) && !minimalistic )
{
height = max(height, dat->avatars_maxheight_size);
}
// Checkbox size
- if ((style & CLS_CHECKBOXES && contact->type == CLCIT_CONTACT) ||
- (style & CLS_GROUPCHECKBOXES && contact->type == CLCIT_GROUP) ||
+ if ((style & CLS_CHECKBOXES && contact->type == CLCIT_CONTACT) ||
+ (style & CLS_GROUPCHECKBOXES && contact->type == CLCIT_GROUP) ||
(contact->type == CLCIT_INFO && contact->flags & CLCIIF_CHECKBOX))
{
height = max(height, dat->checkboxSize);
@@ -603,10 +604,10 @@ int RowHeights_GetRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, // Icon size
if ( !dat->icon_ignore_size_for_row_height) {
- if (contact->type == CLCIT_GROUP
- || (contact->type == CLCIT_CONTACT && contact->iImage != -1
+ if (contact->type == CLCIT_GROUP
+ || (contact->type == CLCIT_CONTACT && contact->iImage != -1
&& !(dat->icon_hide_on_avatar && dat->avatars_show
- && ((dat->use_avatar_service && contact->avatar_data != NULL) ||
+ && ((dat->use_avatar_service && contact->avatar_data != NULL) ||
(!dat->use_avatar_service && contact->avatar_pos != AVATAR_POS_DONT_HAVE))
&& !contact->image_is_special)))
{
@@ -678,7 +679,7 @@ int cliRowHitTest(ClcData *dat, int pos_y) }
int cliGetRowHeight(ClcData *dat, int item)
-{
+{
if ( item >= dat->row_heights_size || item < 0 )
return dat->rowHeight;
diff --git a/plugins/Clist_modern/src/modern_rowtemplateopt.cpp b/plugins/Clist_modern/src/modern_rowtemplateopt.cpp index a04e791d11..d6a9376d67 100644 --- a/plugins/Clist_modern/src/modern_rowtemplateopt.cpp +++ b/plugins/Clist_modern/src/modern_rowtemplateopt.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_clist.h"
#include "hdr/modern_commonprototypes.h"
@@ -30,9 +32,9 @@ static char* rowOptTmplStr; static ROWCELL* rowOptTmplRoot;
static ROWCELL* rowOptTA[100];
TCHAR *types[] = {
- _T("none"), _T("text1"), _T("text2"), _T("text3"), _T("status"),
- _T("avatar"), _T("extra"), _T("extra1"), _T("extra2"), _T("extra3"),
- _T("extra4"), _T("extra5"), _T("extra6"), _T("extra7"), _T("extra8"),
+ _T("none"), _T("text1"), _T("text2"), _T("text3"), _T("status"),
+ _T("avatar"), _T("extra"), _T("extra1"), _T("extra2"), _T("extra3"),
+ _T("extra4"), _T("extra5"), _T("extra6"), _T("extra7"), _T("extra8"),
_T("extra9"), _T("time"), _T("space"), _T("fspace")
};
@@ -58,7 +60,7 @@ void rowOptShowSettings(HWND hwnd) TreeView_GetItem(GetDlgItem(hwnd, IDC_ROWTREE), &tvi);
cell = (pROWCELL)tvi.lParam;
-
+
if ( !tvi.hItem) {
EnableWindow(GetDlgItem(hwnd,IDC_CONTTYPE) ,0);
EnableWindow(GetDlgItem(hwnd,IDC_VALIGN),0);
@@ -96,7 +98,7 @@ void rowOptShowSettings(HWND hwnd) }
SendDlgItemMessage(hwnd, IDC_CONTTYPE, CB_SETCURSEL, cell->type, 0);
-
+
switch (cell->valign) {
case TC_VCENTER:
param = 1;
@@ -198,13 +200,13 @@ void rowOptAddContainer(HWND htree, HTREEITEM hti) cell = cell->next;
}
else {
- rowAddCell(cell->child, ((ROWCELL*)tviparent.lParam)->cont == TC_ROW?TC_COL:TC_ROW);
+ rowAddCell(cell->child, ((ROWCELL*)tviparent.lParam)->cont == TC_ROW?TC_COL:TC_ROW);
cell = cell->child;
}
tvis.hInsertAfter = TVI_LAST;
}
-
+
tvis.item.lParam = (LPARAM)cell;
tvis.hParent = hti;
@@ -213,7 +215,7 @@ void rowOptAddContainer(HWND htree, HTREEITEM hti) tvis.item.iImage = 2;
tvis.item.iSelectedImage = 2;
- TreeView_InsertItem(htree,&tvis);
+ TreeView_InsertItem(htree,&tvis);
TreeView_Expand(htree, hti, TVM_EXPAND);
@@ -259,11 +261,11 @@ void rowOptDelContainer(HWND htree, HTREEITEM hti) }
else
{
-
- tvpi.lParam = 0;
+
+ tvpi.lParam = 0;
rowOptTmplRoot = (pROWCELL)tvpi.lParam;
}
-
+
}
((pROWCELL)tvi.lParam)->next = NULL;
@@ -276,11 +278,11 @@ void rowOptDelContainer(HWND htree, HTREEITEM hti) }
TreeView_DeleteItem(htree, hti);
-
+
// Change icon at parent item
if ( !prnt || (prnt != prev)) return;
-
+
if ( TreeView_GetChild(htree, prnt))
{
tvpi.iImage = 1;
@@ -292,7 +294,7 @@ void rowOptDelContainer(HWND htree, HTREEITEM hti) tvpi.iSelectedImage = 2;
}
TreeView_SetItem(htree, &tvpi);
-
+
}
void RefreshTree(HWND hwndDlg,HTREEITEM hti)
@@ -302,7 +304,7 @@ void RefreshTree(HWND hwndDlg,HTREEITEM hti) TVITEM tvi = {0};
if (hti == NULL) hti = TreeView_GetRoot(htree);
while (hti)
- {
+ {
tvi.hItem = hti;
tvi.mask = TVIF_HANDLE;//|TVIF_IMAGE|TVIF_SELECTEDIMAGE|TVIF_TEXT;
TreeView_GetItem(htree, &tvi);
@@ -336,7 +338,7 @@ void RefreshTree(HWND hwndDlg,HTREEITEM hti) hti = TreeView_GetNextSibling(htree,hti);
}
- RedrawWindow(hwndDlg,NULL,NULL,RDW_INVALIDATE|RDW_ERASE|RDW_UPDATENOW|RDW_ALLCHILDREN);
+ RedrawWindow(hwndDlg,NULL,NULL,RDW_INVALIDATE|RDW_ERASE|RDW_UPDATENOW|RDW_ALLCHILDREN);
}
INT_PTR CALLBACK DlgTmplEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
@@ -347,7 +349,7 @@ INT_PTR CALLBACK DlgTmplEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM int hbuf = 0, seq = 0;
HWND htree = GetDlgItem(hwndDlg,IDC_ROWTREE);
- TranslateDialogDefault(hwndDlg);
+ TranslateDialogDefault(hwndDlg);
rowOptTmplStr = db_get_sa(NULL, "ModernData", "RowTemplate");
if ( !rowOptTmplStr)
rowOptTmplStr = mir_strdup("<TR />");
@@ -409,7 +411,7 @@ INT_PTR CALLBACK DlgTmplEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM if (HIWORD(wParam) == CBN_SELENDOK) {
TVITEM tv = {0};
int index = SendMessage(GetDlgItem(hwndDlg,IDC_CONTTYPE),CB_GETCURSEL, 0, 0);
- cell->type = index;
+ cell->type = index;
RefreshTree(hwndDlg,NULL);
}
@@ -447,9 +449,9 @@ INT_PTR CALLBACK DlgTmplEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM }
if (HIWORD(wParam) == BN_CLICKED) {
- if (lParam == (LPARAM)GetDlgItem(hwndDlg,IDC_ADDCONTAINER))
+ if (lParam == (LPARAM)GetDlgItem(hwndDlg,IDC_ADDCONTAINER))
// Adding new container
- {
+ {
rowOptAddContainer(htree, hti);
}
else if (lParam == (LPARAM)GetDlgItem(hwndDlg,IDC_DELCONTAINER))
@@ -463,7 +465,7 @@ INT_PTR CALLBACK DlgTmplEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM RedrawWindow(htree,&da,NULL,RDW_INVALIDATE|RDW_ERASE|RDW_UPDATENOW|RDW_ALLCHILDREN);
}
RefreshTree(hwndDlg,NULL);
- RedrawWindow(GetParent(hwndDlg),NULL,NULL,RDW_INVALIDATE|RDW_ERASE|RDW_UPDATENOW|RDW_ALLCHILDREN);
+ RedrawWindow(GetParent(hwndDlg),NULL,NULL,RDW_INVALIDATE|RDW_ERASE|RDW_UPDATENOW|RDW_ALLCHILDREN);
}
return TRUE;
}
@@ -539,7 +541,7 @@ INT_PTR CALLBACK DlgTmplEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM i++;
}
- rowSizeWithReposition(rowOptTmplRoot, da.right-da.left);
+ rowSizeWithReposition(rowOptTmplRoot, da.right-da.left);
i = -1;
while (rowOptTA[++i]) {
@@ -550,11 +552,11 @@ INT_PTR CALLBACK DlgTmplEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM case 0:
//if (rowOptTA[i] != (pROWCELL)curItem.lParam)
continue;
- }
- Rectangle(hdc,
- rowOptTA[i]->r.left + da.left,
- rowOptTA[i]->r.top + da.top,
- rowOptTA[i]->r.right + da.left,
+ }
+ Rectangle(hdc,
+ rowOptTA[i]->r.left + da.left,
+ rowOptTA[i]->r.top + da.top,
+ rowOptTA[i]->r.right + da.left,
rowOptTA[i]->r.bottom + da.top);
}
diff --git a/plugins/Clist_modern/src/modern_skinbutton.cpp b/plugins/Clist_modern/src/modern_skinbutton.cpp index 7949f1eecf..57fe0f2293 100644 --- a/plugins/Clist_modern/src/modern_skinbutton.cpp +++ b/plugins/Clist_modern/src/modern_skinbutton.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -24,15 +25,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /*
This file contains code related to new modern free positioned skinned buttons
*/
-#include "hdr/modern_commonheaders.h"
+
+#include "hdr/modern_commonheaders.h"
#include "hdr/modern_skinengine.h"
#include "hdr/modern_clcpaint.h"
#include "m_api/m_skinbutton.h"
-
-
-
-
#define MODERNSKINBUTTONCLASS "MirandaModernSkinButtonClass"
BOOL ModernSkinButtonModuleIsLoaded = FALSE;
static HANDLE hookSystemShutdown_ModernSkinButton = NULL;
@@ -52,7 +50,7 @@ typedef struct _ModernSkinButtonCtrl char * ID;
char * CommandService;
char * StateService;
- char * HandleService;
+ char * HandleService;
char * ValueDBSection;
char * ValueTypeDef;
int Left, Top, Bottom, Right;
@@ -72,9 +70,9 @@ typedef struct _HandleServiceParams static CRITICAL_SECTION csTips;
static HWND hwndToolTips = NULL;
-int ModernSkinButtonLoadModule()
+int ModernSkinButtonLoadModule()
{
- WNDCLASSEX wc;
+ WNDCLASSEX wc;
ZeroMemory(&wc, sizeof(wc));
wc.cbSize = sizeof(wc);
wc.lpszClassName = _T(MODERNSKINBUTTONCLASS);
@@ -108,7 +106,7 @@ static int ModernSkinButtonPaintWorker(HWND hwnd, HDC whdc) if ( !whdc && !g_CluiData.fLayered) InvalidateRect(hwnd,NULL,FALSE);
if (whdc && g_CluiData.fLayered) hdc = whdc;
- else
+ else
{
//sdc = GetWindowDC(GetParent(hwnd));
hdc = CreateCompatibleDC(NULL);
@@ -135,7 +133,7 @@ static int ModernSkinButtonPaintWorker(HWND hwnd, HDC whdc) section = key;
if (bct->ValueTypeDef[0] != 's')
defval = (DWORD)atol(bct->ValueTypeDef+1);
- do
+ do
{
if (key[0] == '/') {key[0] = '\0'; key++; break;}
key++;
@@ -148,7 +146,7 @@ static int ModernSkinButtonPaintWorker(HWND hwnd, HDC whdc) if ( !Value)
Value = mir_strdup(bct->ValueTypeDef+1);
break;
- }
+ }
case 'd':
defval = db_get_dw(NULL,section,key,defval);
Value = mir_strdup(_ltoa(defval,buf,SIZEOF(buf)));
@@ -163,7 +161,7 @@ static int ModernSkinButtonPaintWorker(HWND hwnd, HDC whdc) break;
}
mir_free(section);
- }
+ }
}
g_clcPainter.AddParam(&Request,mod_CalcHash("Module"),"MButton",0);
@@ -174,13 +172,13 @@ static int ModernSkinButtonPaintWorker(HWND hwnd, HDC whdc) if (Value) {
g_clcPainter.AddParam(&Request,mod_CalcHash("Value"),Value,0);
mir_free(Value);
- }
+ }
SkinDrawGlyphMask(hdc,&rc,&rc,&Request);
SkinSelector_DeleteMask(&Request);
// DeleteObject(br);
}
- if ( !whdc && g_CluiData.fLayered)
+ if ( !whdc && g_CluiData.fLayered)
{
RECT r;
SetRect(&r,bct->Left,bct->Top,bct->Right,bct->Bottom);
@@ -195,12 +193,12 @@ static int ModernSkinButtonPaintWorker(HWND hwnd, HDC whdc) }
SelectObject(hdc,oldbmp);
DeleteObject(bmp);
- if ( !whdc || !g_CluiData.fLayered)
- {
+ if ( !whdc || !g_CluiData.fLayered)
+ {
SelectObject(hdc, GetStockObject(DEFAULT_GUI_FONT));
DeleteDC(hdc);
}
- // if (sdc)
+ // if (sdc)
// ReleaseDC(GetParent(hwnd),sdc);
return 0;
}
@@ -219,7 +217,7 @@ static int ModernSkinButtonToggleDBValue(char * ValueDBSection,char *ValueTypeDe // char buf[20];
key = mir_strdup(ValueDBSection);
section = key;
- do
+ do
{
if (key[0] == '/') {key[0] = '\0'; key++; break;}
key++;
@@ -227,7 +225,7 @@ static int ModernSkinButtonToggleDBValue(char * ValueDBSection,char *ValueTypeDe val = mir_strdup(ValueTypeDef+1);
val2 = val;
- do
+ do
{
if (val2[0] == '/') {val2[0] = '\0'; val2++; break;}
val2++;
@@ -244,12 +242,12 @@ static int ModernSkinButtonToggleDBValue(char * ValueDBSection,char *ValueTypeDe Value = db_get_sa(NULL,section,key);
if ( !Value || (Value && mir_bool_strcmpi(Value,val2)))
Value = mir_strdup(val);
- else
+ else
Value = mir_strdup(val2);
db_set_s(NULL,section,key,Value);
mir_free(Value);
break;
-
+
case 'd':
curval = db_get_dw(NULL,section,key,l2);
curval = (curval == l2)?l1:l2;
@@ -259,18 +257,18 @@ static int ModernSkinButtonToggleDBValue(char * ValueDBSection,char *ValueTypeDe case 'w':
curval = db_get_w(NULL,section,key,l2);
curval = (curval == l2)?l1:l2;
- db_set_w(NULL,section,key,(WORD)curval);
+ db_set_w(NULL,section,key,(WORD)curval);
break;
case 'b':
curval = db_get_b(NULL,section,key,l2);
curval = (curval == l2)?l1:l2;
- db_set_b(NULL,section,key,(BYTE)curval);
+ db_set_b(NULL,section,key,(BYTE)curval);
break;
- }
+ }
mir_free(section);
mir_free(val);
- }
+ }
return 0;
}
@@ -279,9 +277,9 @@ static char *_skipblank(char * str) //str will be modified; char * endstr = str+strlen(str);
while ((*str == ' ' || *str == '\t') && *str != '\0') str++;
while ((*endstr == ' ' || *endstr == '\t') && *endstr != '\0' && endstr < str) endstr--;
- if (*endstr != '\0')
+ if (*endstr != '\0')
{
- endstr++;
+ endstr++;
*endstr = '\0';
}
return str;
@@ -300,7 +298,7 @@ static int _CallServiceStrParams(IN char * toParce, OUT int *Return) {
paramCount++;
*param2 = '\0'; param2++;
- _skipblank(param2);
+ _skipblank(param2);
if (strlen(param2) == 0) param2 = NULL;
}
param1 = strrchr(pszService, '%');
@@ -333,7 +331,7 @@ static int _CallServiceStrParams(IN char * toParce, OUT int *Return) else if (param2)
param2 = (char*)atoi(param2);
- if (paramCount == 1)
+ if (paramCount == 1)
{
param1 = param2;
param2 = NULL;
@@ -342,10 +340,10 @@ static int _CallServiceStrParams(IN char * toParce, OUT int *Return) {
result = 0;
}
- else
+ else
{
int ret = 0;
- result = 1;
+ result = 1;
ret = CallService(pszService, (WPARAM)param1, (WPARAM)param2);
if (Return) *Return = ret;
}
@@ -375,7 +373,7 @@ static LRESULT CALLBACK ModernSkinButtonWndProc(HWND hwndDlg, UINT msg, WPARAM case WM_NCCREATE:
SetWindowLongPtr(hwndDlg, GWL_STYLE, GetWindowLongPtr(hwndDlg, GWL_STYLE)|BS_OWNERDRAW);
SetWindowLongPtr(hwndDlg, GWLP_USERDATA, 0);
- if (((CREATESTRUCT *)lParam)->lpszName) SetWindowText(hwndDlg, ((CREATESTRUCT *)lParam)->lpszName);
+ if (((CREATESTRUCT *)lParam)->lpszName) SetWindowText(hwndDlg, ((CREATESTRUCT *)lParam)->lpszName);
return TRUE;
case WM_DESTROY:
@@ -399,9 +397,9 @@ static LRESULT CALLBACK ModernSkinButtonWndProc(HWND hwndDlg, UINT msg, WPARAM LeaveCriticalSection(&csTips);
mir_free(bct->ID);
mir_free(bct->CommandService);
- mir_free(bct->StateService);
- mir_free(bct->HandleService);
- mir_free(bct->Hint);
+ mir_free(bct->StateService);
+ mir_free(bct->HandleService);
+ mir_free(bct->Hint);
mir_free(bct->ValueDBSection);
mir_free(bct->ValueTypeDef);
mir_free(bct);
@@ -415,7 +413,7 @@ static LRESULT CALLBACK ModernSkinButtonWndProc(HWND hwndDlg, UINT msg, WPARAM if (hCurs1) SetCursor(hCurs1);
if (bct) SetToolTip(hwndDlg, bct->Hint);
}
- return 1;
+ return 1;
case WM_PRINT:
if (IsWindowVisible(hwndDlg))
@@ -429,7 +427,7 @@ static LRESULT CALLBACK ModernSkinButtonWndProc(HWND hwndDlg, UINT msg, WPARAM ModernSkinButtonPaintWorker(hwndDlg,(HDC)ps.hdc);
EndPaint(hwndDlg,&ps);
}
- return DefWindowProc(hwndDlg, msg, wParam, lParam);
+ return DefWindowProc(hwndDlg, msg, wParam, lParam);
case WM_CAPTURECHANGED:
bct->hover = 0;
@@ -460,7 +458,7 @@ static LRESULT CALLBACK ModernSkinButtonWndProc(HWND hwndDlg, UINT msg, WPARAM if (bct->fCallOnPress) {
if (bct->CommandService) {
if ( !_CallServiceStrParams(bct->CommandService, NULL) && (bct->ValueDBSection && bct->ValueTypeDef))
- ModernSkinButtonToggleDBValue(bct->ValueDBSection,bct->ValueTypeDef);
+ ModernSkinButtonToggleDBValue(bct->ValueDBSection,bct->ValueTypeDef);
}
bct->down = 0;
@@ -479,8 +477,8 @@ static LRESULT CALLBACK ModernSkinButtonWndProc(HWND hwndDlg, UINT msg, WPARAM if (bct->CommandService)
if (_CallServiceStrParams(bct->CommandService, NULL))
{}
- else if (bct->ValueDBSection && bct->ValueTypeDef)
- ModernSkinButtonToggleDBValue(bct->ValueDBSection,bct->ValueTypeDef);
+ else if (bct->ValueDBSection && bct->ValueTypeDef)
+ ModernSkinButtonToggleDBValue(bct->ValueDBSection,bct->ValueTypeDef);
}
}
return DefWindowProc(hwndDlg, msg, wParam, lParam);
@@ -501,7 +499,7 @@ HWND SetToolTip(HWND hwnd, TCHAR * tip) hwnd, NULL, GetModuleHandle(NULL),
NULL);
- SetWindowPos(hwndToolTips, HWND_TOPMOST, 0, 0, 0, 0,
+ SetWindowPos(hwndToolTips, HWND_TOPMOST, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
}
@@ -543,11 +541,11 @@ int ModernSkinButton_AddButton(HWND parent, char * ID,
char * CommandService,
char * StateDefService,
- char * HandeService,
- int Left,
- int Top,
- int Right,
- int Bottom,
+ char * HandeService,
+ int Left,
+ int Top,
+ int Right,
+ int Bottom,
DWORD sbFlags,
TCHAR * Hint,
char * DBkey,
@@ -566,20 +564,20 @@ int ModernSkinButton_AddButton(HWND parent, ModernSkinButtonCtrl* bct;
int l,r,b,t;
if (parent) GetClientRect(parent,&rc);
- l = ( sbFlags & SBF_ALIGN_TL_RIGHT ) ? ( rc.right + Left ) :
- ( sbFlags & SBF_ALIGN_TL_HCENTER ) ? ( _center_h( &rc ) + Left ) :
+ l = ( sbFlags & SBF_ALIGN_TL_RIGHT ) ? ( rc.right + Left ) :
+ ( sbFlags & SBF_ALIGN_TL_HCENTER ) ? ( _center_h( &rc ) + Left ) :
( rc.left + Left );
-
- t = ( sbFlags & SBF_ALIGN_TL_BOTTOM ) ? ( rc.bottom + Top ) :
+
+ t = ( sbFlags & SBF_ALIGN_TL_BOTTOM ) ? ( rc.bottom + Top ) :
( sbFlags & SBF_ALIGN_TL_VCENTER ) ? ( _center_v( &rc ) + Top ) :
( rc.top+Top );
-
+
r = ( sbFlags & SBF_ALIGN_BR_RIGHT ) ? ( rc.right + Right ) :
( sbFlags & SBF_ALIGN_BR_HCENTER ) ? ( _center_h( &rc) + Right ) :
( rc.left + Right );
-
- b = ( sbFlags & SBF_ALIGN_BR_BOTTOM ) ? ( rc.bottom + Bottom ) :
- ( sbFlags & SBF_ALIGN_BR_VCENTER ) ? ( _center_v( &rc ) + Bottom ) :
+
+ b = ( sbFlags & SBF_ALIGN_BR_BOTTOM ) ? ( rc.bottom + Bottom ) :
+ ( sbFlags & SBF_ALIGN_BR_VCENTER ) ? ( _center_v( &rc ) + Bottom ) :
( rc.top + Bottom );
bct = (ModernSkinButtonCtrl *)mir_alloc(sizeof(ModernSkinButtonCtrl));
memset(bct, 0, sizeof(ModernSkinButtonCtrl));
@@ -601,7 +599,7 @@ int ModernSkinButton_AddButton(HWND parent, Buttons[ButtonsCount].OrT = Top;
Buttons[ButtonsCount].OrR = Right;
Buttons[ButtonsCount].OrB = Bottom;
- Buttons[ButtonsCount].ConstrainPositionFrom = (BYTE)sbFlags;
+ Buttons[ButtonsCount].ConstrainPositionFrom = (BYTE)sbFlags;
Buttons[ButtonsCount].minH = MinHeight;
Buttons[ButtonsCount].minW = MinWidth;
ButtonsCount++;
@@ -623,7 +621,7 @@ static int ModernSkinButtonErase(int l,int t,int r, int b) {
for (i=0; i < ButtonsCount; i++)
{
- if (pcli->hwndContactList && Buttons[i].hwnd != NULL)
+ if (pcli->hwndContactList && Buttons[i].hwnd != NULL)
{
//TODO: Erase button
BitBlt(g_pCachedWindow->hImageDC,Buttons[i].bct->Left,Buttons[i].bct->Top,Buttons[i].bct->Right-Buttons[i].bct->Left,Buttons[i].bct->Bottom-Buttons[i].bct->Top,
@@ -646,11 +644,11 @@ static HWND ModernSkinButtonCreateWindow(ModernSkinButtonCtrl * bct, HWND parent {
TCHAR *UnicodeID;
UnicodeID = mir_a2u(bct->ID);
- hwnd = CreateWindow(_T(MODERNSKINBUTTONCLASS),UnicodeID,WS_VISIBLE|WS_CHILD,bct->Left,bct->Top,bct->Right-bct->Left,bct->Bottom-bct->Top,parent,NULL,g_hInst,NULL);
+ hwnd = CreateWindow(_T(MODERNSKINBUTTONCLASS),UnicodeID,WS_VISIBLE|WS_CHILD,bct->Left,bct->Top,bct->Right-bct->Left,bct->Bottom-bct->Top,parent,NULL,g_hInst,NULL);
mir_free(UnicodeID);
}
- bct->hwnd = hwnd;
+ bct->hwnd = hwnd;
bct->focus = 0;
SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)bct);
return hwnd;
@@ -665,7 +663,7 @@ int ModernSkinButtonRedrawAll(HDC hdc) {
if (pcli->hwndContactList && Buttons[i].hwnd == NULL)
Buttons[i].hwnd = ModernSkinButtonCreateWindow(Buttons[i].bct,pcli->hwndContactList);
- ModernSkinButtonPaintWorker(Buttons[i].hwnd,0);
+ ModernSkinButtonPaintWorker(Buttons[i].hwnd,0);
}
g_mutex_bLockUpdating--;
return 0;
@@ -697,7 +695,7 @@ int ModernSkinButton_ReposButtons(HWND parent, BYTE draw, RECT *r) GetWindowRect(parent,&rd);
GetClientRect(parent,&clr);
if ( !r)
- GetWindowRect(parent,&rc);
+ GetWindowRect(parent,&rc);
else
rc = *r;
if (g_CluiData.fLayered && ( draw & SBRF_DO_ALT_DRAW ))
@@ -725,32 +723,32 @@ int ModernSkinButton_ReposButtons(HWND parent, BYTE draw, RECT *r) altDraw = FALSE;
}
- l = ( sbFlags & SBF_ALIGN_TL_RIGHT ) ? ( rc.right + Buttons[i].OrL ) :
- ( sbFlags & SBF_ALIGN_TL_HCENTER ) ? ( _center_h( &rc ) + Buttons[i].OrL ) :
+ l = ( sbFlags & SBF_ALIGN_TL_RIGHT ) ? ( rc.right + Buttons[i].OrL ) :
+ ( sbFlags & SBF_ALIGN_TL_HCENTER ) ? ( _center_h( &rc ) + Buttons[i].OrL ) :
( rc.left + Buttons[i].OrL );
-
- t = ( sbFlags & SBF_ALIGN_TL_BOTTOM ) ? ( rc.bottom + Buttons[i].OrT ) :
+
+ t = ( sbFlags & SBF_ALIGN_TL_BOTTOM ) ? ( rc.bottom + Buttons[i].OrT ) :
( sbFlags & SBF_ALIGN_TL_VCENTER ) ? ( _center_v( &rc ) + Buttons[i].OrT ) :
( rc.top + Buttons[i].OrT );
-
+
r = ( sbFlags & SBF_ALIGN_BR_RIGHT ) ? ( rc.right + Buttons[i].OrR ) :
( sbFlags & SBF_ALIGN_BR_HCENTER ) ? ( _center_h( &rc) + Buttons[i].OrR ) :
( rc.left + Buttons[i].OrR );
-
- b = ( sbFlags & SBF_ALIGN_BR_BOTTOM ) ? ( rc.bottom + Buttons[i].OrB ) :
- ( sbFlags & SBF_ALIGN_BR_VCENTER ) ? ( _center_v( &rc ) + Buttons[i].OrB ) :
+
+ b = ( sbFlags & SBF_ALIGN_BR_BOTTOM ) ? ( rc.bottom + Buttons[i].OrB ) :
+ ( sbFlags & SBF_ALIGN_BR_VCENTER ) ? ( _center_v( &rc ) + Buttons[i].OrB ) :
( rc.top + Buttons[i].OrB );
-
+
SetWindowPos(Buttons[i].hwnd,HWND_TOP,l,t,r-l,b-t,0);
- if ( (rc.right-rc.left < Buttons[i].minW /* && Buttons[i].minW != 0*/)
+ if ( (rc.right-rc.left < Buttons[i].minW /* && Buttons[i].minW != 0*/)
|| (rc.bottom-rc.top < Buttons[i].minH /* && Buttons[i].minH != 0*/))
CLUI_ShowWindowMod(Buttons[i].hwnd,SW_HIDE);
- else
+ else
CLUI_ShowWindowMod(Buttons[i].hwnd,SW_SHOW);
- if ((1 || altDraw) &&
- (Buttons[i].bct->Left != l ||
- Buttons[i].bct->Top != t ||
- Buttons[i].bct->Right != r ||
+ if ((1 || altDraw) &&
+ (Buttons[i].bct->Left != l ||
+ Buttons[i].bct->Top != t ||
+ Buttons[i].bct->Right != r ||
Buttons[i].bct->Bottom != b))
{
//Need to erase in old location
diff --git a/plugins/Clist_modern/src/modern_skineditor.cpp b/plugins/Clist_modern/src/modern_skineditor.cpp index 14d81f762d..c30ac25df9 100644 --- a/plugins/Clist_modern/src/modern_skineditor.cpp +++ b/plugins/Clist_modern/src/modern_skineditor.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_clist.h"
#include "hdr/modern_commonprototypes.h"
@@ -39,14 +41,14 @@ int gl_controlID = 0; int EnableGroup(HWND hwndDlg, HWND first, BOOL bEnable);
int ShowGroup(HWND hwndDlg, HWND first, BOOL bEnable);
BOOL glOtherSkinWasLoaded = FALSE;
-BYTE glSkinWasModified = 0; //1- but not applied, 2-stored to DB
+BYTE glSkinWasModified = 0; //1- but not applied, 2-stored to DB
HTREEITEM FindChild(HWND hTree, HTREEITEM Parent, TCHAR *Caption)
{
HTREEITEM res = NULL, tmp = NULL;
- if (Parent)
+ if (Parent)
tmp = TreeView_GetChild(hTree,Parent);
- else
+ else
tmp = TreeView_GetRoot(hTree);
while (tmp)
{
@@ -78,8 +80,8 @@ int TreeAddObject(HWND hwndDlg, int ID, OPT_OBJECT_DATA * data) }
ptr = path;
- ptrE = path;
- do
+ ptrE = path;
+ do
{
while (*ptrE != '/' && *ptrE != '\0') ptrE++;
if (*ptrE == '/')
@@ -98,15 +100,15 @@ int TreeAddObject(HWND hwndDlg, int ID, OPT_OBJECT_DATA * data) tvis.item.pszText = ptr;
tvis.item.lParam = 0;
cItem = TreeView_InsertItem(GetDlgItem(hwndDlg, ID), &tvis);
-
- }
+
+ }
rootItem = cItem;
}
ptr = ptrE;
}
else ext = TRUE;
}while (!ext);
-
+
//Insert item node
{
TVINSERTSTRUCT tvis;
@@ -142,8 +144,8 @@ int enumDB_SkinObjectsForEditorProc(const char *szSetting,LPARAM lParam) mir_free(value);
mir_free(desc);
}
- mir_free(descKey);
- }
+ mir_free(descKey);
+ }
return 0;
}
@@ -168,12 +170,12 @@ void SetAppropriateGroups(HWND hwndDlg, int Type) switch (Type)
{
case -1:
- {
+ {
EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_GROUP_1),FALSE);
EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_ST_COLOUR),FALSE);
EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_ST_ALPHA),FALSE);
EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_GROUP_2),FALSE);
- EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_GROUP_3),FALSE);
+ EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_GROUP_3),FALSE);
ShowWindow(GetDlgItem(hwndDlg,IDC_S_SIZE),FALSE);
}
break;
@@ -183,7 +185,7 @@ void SetAppropriateGroups(HWND hwndDlg, int Type) EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_ST_COLOUR),FALSE);
EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_ST_ALPHA),FALSE);
EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_GROUP_2),FALSE);
- EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_GROUP_3),FALSE);
+ EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_GROUP_3),FALSE);
ShowWindow(GetDlgItem(hwndDlg,IDC_S_SIZE),FALSE);
}
break;
@@ -192,7 +194,7 @@ void SetAppropriateGroups(HWND hwndDlg, int Type) EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_GROUP_1),TRUE);
EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_ST_COLOUR),TRUE);
EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_ST_ALPHA),TRUE);
- EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_GROUP_2),FALSE);
+ EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_GROUP_2),FALSE);
EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_GROUP_3),FALSE);
ShowWindow(GetDlgItem(hwndDlg,IDC_S_SIZE),FALSE);
//Set Color and alpha
@@ -227,7 +229,7 @@ void SetControls(HWND hwndDlg, TCHAR *str) {
if ( !str)
{
- SetAppropriateGroups(hwndDlg,-1);
+ SetAppropriateGroups(hwndDlg,-1);
return;
}
@@ -256,27 +258,27 @@ void SetControls(HWND hwndDlg, TCHAR *str) case 2:
{
int fitmode = 0;
-
+
int l = _ttoi(GetParamN(str,buf,SIZEOF(buf),4,',',TRUE));
int t = _ttoi(GetParamN(str,buf,SIZEOF(buf),5,',',TRUE));
int r = _ttoi(GetParamN(str,buf,SIZEOF(buf),6,',',TRUE));
int b = _ttoi(GetParamN(str,buf,SIZEOF(buf),7,',',TRUE));
int a = _ttoi(GetParamN(str,buf,SIZEOF(buf),8,',',TRUE));
-
+
SendDlgItemMessage(hwndDlg,IDC_SPIN_ALPHA,UDM_SETPOS, 0, MAKELONG(a,0));
SendDlgItemMessage(hwndDlg,IDC_SPIN_LEFT,UDM_SETPOS, 0, MAKELONG(l,0));
SendDlgItemMessage(hwndDlg,IDC_SPIN_TOP,UDM_SETPOS, 0, MAKELONG(t,0));
SendDlgItemMessage(hwndDlg,IDC_SPIN_RIGHT,UDM_SETPOS, 0, MAKELONG(r,0));
SendDlgItemMessage(hwndDlg,IDC_SPIN_BOTTOM,UDM_SETPOS, 0, MAKELONG(b,0));
-
+
GetParamN(str,buf,SIZEOF(buf),2,',',TRUE);
SetDlgItemText(hwndDlg,IDC_FILE,buf);
-
+
GetParamN(str,buf,SIZEOF(buf),3,',',TRUE);
if (!lstrcmpi(buf,_T("TileBoth"))) fitmode = FM_TILE_BOTH;
else if (!lstrcmpi(buf,_T("TileVert"))) fitmode = FM_TILE_VERT;
else if (!lstrcmpi(buf,_T("TileHorz"))) fitmode = FM_TILE_HORZ;
- else fitmode = 0;
+ else fitmode = 0;
SendDlgItemMessage(hwndDlg,IDC_FIT,CB_SETCURSEL,(WPARAM)fitmode,0);
}
@@ -284,7 +286,7 @@ void SetControls(HWND hwndDlg, TCHAR *str) case 3:
{
int fitmode = 0;
-
+
int x = _ttoi(GetParamN(str,buf,SIZEOF(buf),3,',',TRUE));
int y = _ttoi(GetParamN(str,buf,SIZEOF(buf),4,',',TRUE));
int w = _ttoi(GetParamN(str,buf,SIZEOF(buf),5,',',TRUE));
@@ -295,7 +297,7 @@ void SetControls(HWND hwndDlg, TCHAR *str) int r = _ttoi(GetParamN(str,buf,SIZEOF(buf),10, ',',TRUE));
int b = _ttoi(GetParamN(str,buf,SIZEOF(buf),11,',',TRUE));
int a = _ttoi(GetParamN(str,buf,SIZEOF(buf),12,',',TRUE));
-
+
SendDlgItemMessage(hwndDlg,IDC_SPIN_ALPHA,UDM_SETPOS, 0, MAKELONG(a,0));
SendDlgItemMessage(hwndDlg,IDC_SPIN_LEFT,UDM_SETPOS, 0, MAKELONG(l,0));
SendDlgItemMessage(hwndDlg,IDC_SPIN_TOP,UDM_SETPOS, 0, MAKELONG(t,0));
@@ -306,15 +308,15 @@ void SetControls(HWND hwndDlg, TCHAR *str) SendDlgItemMessage(hwndDlg,IDC_SPIN_POSTOP,UDM_SETPOS, 0, MAKELONG(y,0));
SendDlgItemMessage(hwndDlg,IDC_SPIN_WIDTH,UDM_SETPOS, 0, MAKELONG(w,0));
SendDlgItemMessage(hwndDlg,IDC_SPIN_HEIGHT,UDM_SETPOS, 0, MAKELONG(h,0));
-
+
GetParamN(str,buf,SIZEOF(buf),2,',',TRUE);
SetDlgItemText(hwndDlg,IDC_FILE,buf);
-
+
GetParamN(str,buf,SIZEOF(buf),7,',',TRUE);
if (!lstrcmpi(buf,_T("TileBoth"))) fitmode = FM_TILE_BOTH;
else if (!lstrcmpi(buf,_T("TileVert"))) fitmode = FM_TILE_VERT;
else if (!lstrcmpi(buf,_T("TileHorz"))) fitmode = FM_TILE_HORZ;
- else fitmode = 0;
+ else fitmode = 0;
SendDlgItemMessage(hwndDlg,IDC_FIT,CB_SETCURSEL,(WPARAM)fitmode,0);
}
@@ -336,13 +338,13 @@ int GetShortFileName(TCHAR *FullFile) mir_free(file);
return 1; //skin folder relative
}
-
+
PathToRelativeT(FullFile, buf);
if (buf[0] != '\\' && buf[1] != ':')
mir_sntprintf(FullFile, MAX_PATH, _T("\\%s"), buf);
else
_tcsncpy(FullFile, buf, MAX_PATH);
-
+
mir_free(file);
return 2; //mirand folder relative
}
@@ -419,7 +421,7 @@ TCHAR* MadeString(HWND hwndDlg) void UpdateInfo(HWND hwndDlg)
{
TCHAR *b = MadeString(hwndDlg);
- if (!b)
+ if (!b)
{
SetDlgItemText(hwndDlg,IDC_EDIT1,_T(""));
return;
@@ -497,7 +499,7 @@ int GetFileSizes(HWND hwndDlg) ske_UnloadGlyphImage(hbmp);
}
- mir_sntprintf(buf, MAX_PATH, _T("%s %d x %d %s"),TranslateT("Image size is"), sz.cx, sz.cy, TranslateT("pixels"));
+ mir_sntprintf(buf, MAX_PATH, _T("%s %d x %d %s"),TranslateT("Image size is"), sz.cx, sz.cy, TranslateT("pixels"));
SetDlgItemText(hwndDlg, IDC_S_SIZE, buf);
return 0;
}
@@ -548,7 +550,7 @@ INT_PTR CALLBACK DlgSkinEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM SendDlgItemMessage(hwndDlg,IDC_SPIN_POSTOP,UDM_SETRANGE, 0, MAKELONG(1000, 0));
SendDlgItemMessage(hwndDlg,IDC_SPIN_WIDTH,UDM_SETRANGE, 0, MAKELONG(1000, 0));
SendDlgItemMessage(hwndDlg,IDC_SPIN_HEIGHT,UDM_SETRANGE, 0, MAKELONG(1000, 0));
- }
+ }
EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_GROUP_1),FALSE);
EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_ST_COLOUR),FALSE);
EnableGroup(hwndDlg,GetDlgItem(hwndDlg,IDC_ST_ALPHA),FALSE);
@@ -560,8 +562,8 @@ INT_PTR CALLBACK DlgSkinEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM glOtherSkinWasLoaded = FALSE;
break;
- case WM_COMMAND:
- {
+ case WM_COMMAND:
+ {
if (LOWORD(wParam) == IDC_TYPE)
{
if (HIWORD(wParam) == CBN_SELCHANGE)
@@ -581,7 +583,7 @@ INT_PTR CALLBACK DlgSkinEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM {
mir_free_and_nil(object_clipboard);
- OPT_OBJECT_DATA *sd = NULL;
+ OPT_OBJECT_DATA *sd = NULL;
HTREEITEM hti = TreeView_GetSelection(GetDlgItem(hwndDlg,IDC_OBJECT_TREE));
if (hti != 0)
{
@@ -591,7 +593,7 @@ INT_PTR CALLBACK DlgSkinEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM TreeView_GetItem(GetDlgItem(hwndDlg,IDC_OBJECT_TREE),&tvi);
sd = (OPT_OBJECT_DATA*)(tvi.lParam);
}
- if (sd && sd->szValue)
+ if (sd && sd->szValue)
object_clipboard = mir_tstrdup(sd->szValue);
EnableWindow(GetDlgItem(hwndDlg,IDC_PASTE),object_clipboard != NULL);
@@ -602,7 +604,7 @@ INT_PTR CALLBACK DlgSkinEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM {
if (HIWORD(wParam) == BN_CLICKED)
{
- if (object_clipboard)
+ if (object_clipboard)
SetControls(hwndDlg, object_clipboard);
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
UpdateInfo(hwndDlg);
@@ -621,7 +623,7 @@ INT_PTR CALLBACK DlgSkinEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM int res = 0;
ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400;
ofn.hwndOwner = hwndDlg;
- ofn.hInstance = NULL;
+ ofn.hInstance = NULL;
ofn.lpstrFilter = _T("Images (*.png,*.jpg,*.bmp,*.gif,*.tga)\0*.png;*.jpg;*.jpeg;*.bmp;*.gif;*.tga\0All files (*.*)\0*.*\0\0");
ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
GetDlgItemText(hwndDlg, IDC_FILE, str, SIZEOF(str));
@@ -675,7 +677,7 @@ INT_PTR CALLBACK DlgSkinEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM || LOWORD(wParam) == IDC_E_W
|| LOWORD(wParam) == IDC_E_H
|| LOWORD(wParam) == IDC_EDIT_ALPHA
- )
+ )
&& HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()))
{
return 0;
@@ -744,10 +746,10 @@ INT_PTR CALLBACK DlgSkinEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM {
StoreTreeToDB(GetDlgItem(hwndDlg,IDC_OBJECT_TREE),SKIN);
//ReloadSkin
- ske_LoadSkinFromDB();
+ ske_LoadSkinFromDB();
pcli->pfnClcBroadcast( INTM_RELOADOPTIONS, 0, 0);
Sync(CLUIFrames_OnClistResize_mod, 0, 0);
- ske_RedrawCompleteWindow();
+ ske_RedrawCompleteWindow();
Sync(CLUIFrames_OnClistResize_mod, 0, 0);
{
HWND hwnd = pcli->hwndContactList;
@@ -757,13 +759,13 @@ INT_PTR CALLBACK DlgSkinEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM }
return TRUE;
}
- else
+ else
return TRUE;
}
break;
}
- case WM_DESTROY:
+ case WM_DESTROY:
mir_free(object_clipboard);
break;
@@ -781,7 +783,7 @@ int EnableGroup(HWND hwndDlg, HWND first, BOOL bEnable) EnableWindow(hwnd,bEnable);
hwnd = GetWindow(hwnd,GW_HWNDNEXT);
if ( !hwnd || GetWindowLongPtr(hwnd,GWL_STYLE)&WS_GROUP) exit = TRUE;
- }
+ }
while (!exit);
return 0;
}
@@ -800,4 +802,3 @@ int ShowGroup(HWND hwndDlg, HWND first, BOOL bEnable) while (!exit);
return 0;
}
-
diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp index 1154dd2e3f..114532d0a2 100644 --- a/plugins/Clist_modern/src/modern_skinengine.cpp +++ b/plugins/Clist_modern/src/modern_skinengine.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp index aa5a246e9c..aa0323f9dc 100644 --- a/plugins/Clist_modern/src/modern_skinopt.cpp +++ b/plugins/Clist_modern/src/modern_skinopt.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_clist.h"
#include "hdr/modern_commonprototypes.h"
diff --git a/plugins/Clist_modern/src/modern_skinselector.cpp b/plugins/Clist_modern/src/modern_skinselector.cpp index 2e242807b6..9253351990 100644 --- a/plugins/Clist_modern/src/modern_skinselector.cpp +++ b/plugins/Clist_modern/src/modern_skinselector.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_statusbar_options.cpp b/plugins/Clist_modern/src/modern_statusbar_options.cpp index 729814fc7d..a8de213731 100644 --- a/plugins/Clist_modern/src/modern_statusbar_options.cpp +++ b/plugins/Clist_modern/src/modern_statusbar_options.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,11 +21,11 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_clc.h"
#include "hdr/modern_commonprototypes.h"
#include "hdr/modern_defsettings.h"
-//#include "hdr/modern_effectenum.h"
typedef struct _StatusBarProtocolOptions
{
@@ -314,8 +315,8 @@ INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l return TRUE;
case WM_COMMAND:
- if (LOWORD(wParam) == IDC_BUTTON1)
- {
+ if (LOWORD(wParam) == IDC_BUTTON1)
+ {
if (HIWORD(wParam) == BN_CLICKED)
{
CHOOSEFONTA fnt;
@@ -327,7 +328,7 @@ INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l ChooseFontA(&fnt);
SendMessage(GetParent(hwndDlg), PSM_CHANGED, (WPARAM)hwndDlg, 0);
return 0;
- }
+ }
}
else if (LOWORD(wParam) == IDC_COLOUR || (LOWORD(wParam) == IDC_SBAR_HORIZ_ALIGN && HIWORD(wParam) == CBN_SELCHANGE)) SendMessage(GetParent(hwndDlg), PSM_CHANGED, (WPARAM)hwndDlg, 0);
else if (LOWORD(wParam) == IDC_SHOWSBAR) {
@@ -369,7 +370,7 @@ INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l UpdateStatusBarOptionsDisplay(hwndDlg);
- SendMessage(GetParent(hwndDlg), PSM_CHANGED, (WPARAM)hwndDlg, 0);
+ SendMessage(GetParent(hwndDlg), PSM_CHANGED, (WPARAM)hwndDlg, 0);
}
else if (LOWORD(wParam) == IDC_STATUSBAR_PER_PROTO)
{
@@ -383,10 +384,10 @@ INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l SendMessage(GetParent(hwndDlg), PSM_CHANGED, (WPARAM)hwndDlg, 0);
}
else if (
- LOWORD(wParam) == IDC_SHOWXSTATUS ||
- LOWORD(wParam) == IDC_SHOWBOTH ||
- LOWORD(wParam) == IDC_SHOWNORMAL ||
- LOWORD(wParam) == IDC_TRANSPARENTOVERLAY ||
+ LOWORD(wParam) == IDC_SHOWXSTATUS ||
+ LOWORD(wParam) == IDC_SHOWBOTH ||
+ LOWORD(wParam) == IDC_SHOWNORMAL ||
+ LOWORD(wParam) == IDC_TRANSPARENTOVERLAY ||
LOWORD(wParam) == IDC_SHOWXSTATUSNAME)
{
UpdateXStatusIconOptions(hwndDlg, perProto, dat, curSelProto);
@@ -449,17 +450,17 @@ INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l _GlobalOptions.PaddingRight = (DWORD)SendDlgItemMessage(hwndDlg,IDC_OFFSETSPIN_RIGHT,UDM_GETPOS, 0, 0);
}
else if ((
- LOWORD(wParam) == IDC_MULTI_COUNT ||
- LOWORD(wParam) == IDC_OFFSETICON ||
- LOWORD(wParam) == IDC_OFFSETICON2 ||
- LOWORD(wParam) == IDC_OFFSETICON3 ||
- LOWORD(wParam) == IDC_SBAR_BORDER_BOTTOM ||
+ LOWORD(wParam) == IDC_MULTI_COUNT ||
+ LOWORD(wParam) == IDC_OFFSETICON ||
+ LOWORD(wParam) == IDC_OFFSETICON2 ||
+ LOWORD(wParam) == IDC_OFFSETICON3 ||
+ LOWORD(wParam) == IDC_SBAR_BORDER_BOTTOM ||
LOWORD(wParam) == IDC_SBAR_BORDER_TOP
) && (
- HIWORD(wParam) != EN_CHANGE ||
+ HIWORD(wParam) != EN_CHANGE ||
(HWND)lParam != GetFocus()
))
- return 0; // dont make apply enabled during buddy set crap
+ return 0; // dont make apply enabled during buddy set crap
else if ( LOWORD(wParam) == IDC_STATUSBAR_PROTO_LIST )
{
UpdateStatusBarOptionsDisplay(hwndDlg);
@@ -523,7 +524,7 @@ INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l db_set_b(NULL,"CLUI","ShowSBar",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_SHOWSBAR));
LoadStatusBarData();
- cliCluiProtocolStatusChanged(0, 0);
+ cliCluiProtocolStatusChanged(0, 0);
return TRUE;
}
}
diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp index 0968afe4b6..8541674d50 100644 --- a/plugins/Clist_modern/src/modern_toolbar.cpp +++ b/plugins/Clist_modern/src/modern_toolbar.cpp @@ -1,11 +1,12 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-
+Miranda NG: the free IM client for Microsoft* Windows*
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
Copyright 2007 Artem Shpynov
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -37,7 +38,7 @@ struct BOOL bVisByDefault;
HANDLE hButton;
}
-static BTNS[] =
+static BTNS[] =
{
{ "MainMenu", LPGEN("Main menu"), "CList/ShowMainMenu", LPGEN("Main menu"), NULL, 100 , IDI_RESETVIEW, IDI_RESETVIEW, TRUE },
{ "StatusMenu", LPGEN("Status menu"), "CList/ShowStatusMenu", LPGEN("Status menu"), NULL, 105 , IDI_RESETVIEW, IDI_RESETVIEW, TRUE },
@@ -107,7 +108,7 @@ struct HBITMAP mtb_hBmpBackground;
COLORREF mtb_bkColour;
WORD mtb_backgroundBmpUse;
- BOOL mtb_useWinColors;
+ BOOL mtb_useWinColors;
}
static tbdat = { NULL, CLCDEFAULT_BKCOLOUR, CLCDEFAULT_BKBMPUSE, CLCDEFAULT_USEWINDOWSCOLOURS };
@@ -129,18 +130,18 @@ static int ehhToolBarSettingsChanged(WPARAM wParam, LPARAM lParam) if (!mir_strcmp(cws->szSetting,"UseSound"))
SetButtonPressed(7, cws->value.bVal);
}
-
+
return 0;
}
static BOOL sttDrawToolBarBackground(HWND hwnd, HDC hdc, RECT *rect, ModernToolbarCtrl* pMTBInfo)
{
BOOL bFloat = (GetParent(hwnd)!=pcli->hwndContactList);
- if (g_CluiData.fDisableSkinEngine || !g_CluiData.fLayered || bFloat) {
+ if (g_CluiData.fDisableSkinEngine || !g_CluiData.fLayered || bFloat) {
HBRUSH hbr;
RECT rc;
- if (rect)
+ if (rect)
rc=*rect;
else
GetClientRect(hwnd,&rc);
@@ -153,7 +154,7 @@ static BOOL sttDrawToolBarBackground(HWND hwnd, HDC hdc, RECT *rect, ModernToolb FillRect(hdc, &rc, hbr);
}
}
- else if (!tbdat.mtb_hBmpBackground && !tbdat.mtb_useWinColors) {
+ else if (!tbdat.mtb_hBmpBackground && !tbdat.mtb_useWinColors) {
hbr = CreateSolidBrush(tbdat.mtb_bkColour);
FillRect(hdc, &rc, hbr);
DeleteObject(hbr);
@@ -171,7 +172,7 @@ static void sttDrawNonLayeredSkinedBar(HWND hwnd, HDC hdc) rc.bottom++;
HDC hdc2 = CreateCompatibleDC(hdc);
HBITMAP hbmp = ske_CreateDIB32(rc.right, rc.bottom);
- HBITMAP hbmpo = (HBITMAP)SelectObject(hdc2, hbmp);
+ HBITMAP hbmpo = (HBITMAP)SelectObject(hdc2, hbmp);
if (GetParent(hwnd) != pcli->hwndContactList) {
HBRUSH br = GetSysColorBrush(COLOR_3DFACE);
FillRect(hdc2, &rc, br);
@@ -185,7 +186,7 @@ static void sttDrawNonLayeredSkinedBar(HWND hwnd, HDC hdc) DeleteDC(hdc2);
SelectObject(hdc, (HFONT)GetStockObject(DEFAULT_GUI_FONT));
- ValidateRect(hwnd, NULL);
+ ValidateRect(hwnd, NULL);
}
static LRESULT CALLBACK toolbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
@@ -196,7 +197,7 @@ static LRESULT CALLBACK toolbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA case WM_ERASEBKGND:
return (g_CluiData.fDisableSkinEngine) ? sttDrawToolBarBackground(hwnd, (HDC)wParam, NULL, pMTBInfo) : 0;
- case WM_NCPAINT:
+ case WM_NCPAINT:
case WM_PAINT:
{
PAINTSTRUCT ps;
@@ -206,7 +207,7 @@ static LRESULT CALLBACK toolbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA if ((!g_CluiData.fLayered || bFloat) && !g_CluiData.fDisableSkinEngine)
sttDrawNonLayeredSkinedBar(hwnd, ps.hdc);
else
- sttDrawToolBarBackground(hwnd, ps.hdc, &ps.rcPaint, pMTBInfo);
+ sttDrawToolBarBackground(hwnd, ps.hdc, &ps.rcPaint, pMTBInfo);
EndPaint(hwnd,&ps);
}
}
@@ -222,7 +223,7 @@ static LRESULT CALLBACK toolbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA RECT MyRect={0};
HDC hDC=(HDC)wParam;
GetWindowRect(hwnd,&MyRect);
-
+
RECT rcClient;
GetClientRect(hwnd, &rcClient);
SkinDrawGlyph(hDC, &rcClient, &rcClient, "Bar,ID=ToolBar,Part=Background");
@@ -235,7 +236,7 @@ static LRESULT CALLBACK toolbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA Offset.x = childRect.left - MyRect.left;
Offset.y = childRect.top - MyRect.top;
SendMessage(mtbi->hWindow, BUTTONDRAWINPARENT, (WPARAM)hDC, (LPARAM)&Offset);
- }
+ }
}
return 0;
@@ -293,7 +294,7 @@ static void CopySettings(const char* to, const char* from, int defValue) void CustomizeButton(HANDLE ttbid, HWND hWnd, LPARAM lParam);
static int Toolbar_ModuleReloaded(WPARAM wParam, LPARAM lParam)
-{
+{
PLUGININFOEX *pInfo = (PLUGININFOEX*)wParam;
if ( !_stricmp(pInfo->shortName, "TopToolBar"))
TopToolbar_SetCustomProc(CustomizeButton, 0);
@@ -304,7 +305,7 @@ static int Toolbar_ModuleReloaded(WPARAM wParam, LPARAM lParam) static int Toolbar_ModulesLoaded(WPARAM, LPARAM)
{
CallService(MS_BACKGROUNDCONFIG_REGISTER, (WPARAM)(LPGEN("ToolBar Background")"/ToolBar"),0);
-
+
HookEvent(ME_DB_CONTACT_SETTINGCHANGED, ehhToolBarSettingsChanged);
TopToolbar_SetCustomProc(CustomizeButton, 0);
diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index 47ad286f06..fdd9b79130 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -1,8 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -165,7 +167,7 @@ static void ShowPage(HWND hwnd, int page) static int UpdateClistItem(HANDLE hContact, DWORD mask)
{
for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++)
- SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_SETEXTRAIMAGE, (WPARAM)hContact, MAKELONG(i - ID_STATUS_OFFLINE,
+ SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_SETEXTRAIMAGE, (WPARAM)hContact, MAKELONG(i - ID_STATUS_OFFLINE,
(1 << (i - ID_STATUS_OFFLINE)) & mask ? i - ID_STATUS_OFFLINE : nullImage));
return 0;
@@ -226,7 +228,7 @@ static int FillDialog(HWND hwnd) item.mask = LVIF_TEXT;
item.iItem = 1000;
- for (i=0; i < protoCount; i++)
+ for (i=0; i < protoCount; i++)
{
item.pszText = accs[i]->szModuleName;
newItem = SendMessageA(hwndList, LVM_INSERTITEMA, 0, (LPARAM)&item);
@@ -301,7 +303,7 @@ static void SetAllChildIcons(HWND hwndList,HANDLE hFirstItem,int iColumn,int iIm //check groups
if (typeOfFirst == CLCIT_GROUP) hItem = hFirstItem;
else hItem = (HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTGROUP,(LPARAM)hFirstItem);
- while(hItem)
+ while(hItem)
{
hChildItem = (HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_CHILD,(LPARAM)hItem);
if (hChildItem)
@@ -452,7 +454,7 @@ void SaveState() HANDLE hItem = (HANDLE)SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);
if (hItem == NULL)
continue;
-
+
if (SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItem, 0)) {
DWORD dwLocalMask = GetMaskForItem(hItem);
db_set_dw(hContact, CLVM_MODULE, szModeName, MAKELONG(1, (unsigned short)dwLocalMask));
@@ -479,7 +481,7 @@ void SaveState() MAKEWORD(SendDlgItemMessage(clvmHwnd, IDC_LASTMESSAGEOP, CB_GETCURSEL, 0, 0),
SendDlgItemMessage(clvmHwnd, IDC_LASTMESSAGEUNIT, CB_GETCURSEL, 0, 0)));
- SaveViewMode(szModeName, newGroupFilter, newProtoFilter, statusMask, dwGlobalMask, options,
+ SaveViewMode(szModeName, newGroupFilter, newProtoFilter, statusMask, dwGlobalMask, options,
stickies, operators, lmdat);
if (szModeName && szModeName != (char*)szTempModeName)
@@ -532,7 +534,7 @@ static void UpdateFilters() if (db_get_ts(NULL, CLVM_MODULE, szSetting, &dbv_gf))
goto cleanup;
mir_snprintf(szSetting, 128, "%c%s_OPT", 246, szBuf);
- if ((opt = db_get_dw(NULL, CLVM_MODULE, szSetting, -1)) != -1)
+ if ((opt = db_get_dw(NULL, CLVM_MODULE, szSetting, -1)) != -1)
{
SendDlgItemMessage(clvmHwnd, IDC_AUTOCLEARSPIN, UDM_SETPOS, 0, MAKELONG(LOWORD(opt), 0));
}
@@ -552,7 +554,7 @@ static void UpdateFilters() item.pszText = szTemp;
item.cchTextMax = 255;
- for (i=0; i < ListView_GetItemCount(hwndList); i++)
+ for (i=0; i < ListView_GetItemCount(hwndList); i++)
{
item.iItem = i;
SendMessageA(hwndList, LVM_GETITEMA, 0, (LPARAM)&item);
@@ -667,7 +669,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP clvmHwnd = hwndDlg;
switch(msg) {
- case WM_INITDIALOG:
+ case WM_INITDIALOG:
xpt_EnableThemeDialogTexture(hwndDlg, ETDT_ENABLETAB);
himlViewModes = ImageList_Create(16, 16, ILC_MASK | ILC_COLOR32, 12, 0);
{
@@ -713,7 +715,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETINDENT,10, 0);
for (i=0; i <= FONTID_MAX; i++)
SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETTEXTCOLOR,i,GetSysColor(COLOR_WINDOWTEXT));
-
+
CLCINFOITEM cii = { sizeof(cii) };
cii.hParentGroup = 0;
cii.pszText = TranslateT("*** All contacts ***");
@@ -889,7 +891,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP NMCLISTCONTROL *nm = (NMCLISTCONTROL*)lParam;
if (nm->iColumn == -1)
break;
-
+
DWORD hitFlags;
HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg,IDC_CLIST,CLM_HITTEST,(WPARAM)&hitFlags,MAKELPARAM(nm->pt.x,nm->pt.y));
if (hItem == NULL)
@@ -897,7 +899,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP if ( !(hitFlags & CLCHT_ONITEMEXTRA))
break;
-
+
int iImage = SendDlgItemMessage(hwndDlg,IDC_CLIST,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(nm->iColumn,0));
if (iImage == nullImage)
iImage = nm->iColumn;
@@ -970,31 +972,31 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case WM_CREATE:
{
RECT rcMargins = {12, 0, 2,0};
- hwndSelector = CreateWindow( MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP , 0, 0, 20, 20,
+ hwndSelector = CreateWindow( MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP , 0, 0, 20, 20,
hwnd, (HMENU) IDC_SELECTMODE, g_hInst, NULL);
MakeButtonSkinned(hwndSelector);
SendMessage(hwndSelector, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Select a view mode"), BATF_TCHAR);
- SendMessage(hwndSelector, BUTTONSETMARGINS,0 ,(LPARAM) &rcMargins);
- SendMessage(hwndSelector, BUTTONSETID,0 ,(LPARAM) "ViewMode.Select");
+ SendMessage(hwndSelector, BUTTONSETMARGINS,0 ,(LPARAM) &rcMargins);
+ SendMessage(hwndSelector, BUTTONSETID,0 ,(LPARAM) "ViewMode.Select");
SendMessage(hwndSelector, WM_SETFONT,0 ,(LPARAM) FONTID_VIEMODES+1 );
SendMessage(hwndSelector, BUTTONSETASFLATBTN, TRUE, 0 );
SendMessage(hwndSelector, MBM_UPDATETRANSPARENTFLAG, 0, 2);
- SendMessage(hwndSelector, BUTTONSETSENDONDOWN, 0 ,(LPARAM) 1 );
+ SendMessage(hwndSelector, BUTTONSETSENDONDOWN, 0 ,(LPARAM) 1 );
//SendMessage(hwndSelector, BM_SETASMENUACTION, 1, 0);
- HWND hwndButton = CreateWindow( MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20,
+ HWND hwndButton = CreateWindow( MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20,
hwnd, (HMENU) IDC_CONFIGUREMODES, g_hInst, NULL);
MakeButtonSkinned(hwndButton);
SendMessage(hwndButton, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Setup view modes"), BATF_TCHAR);
- SendMessage(hwndButton, BUTTONSETID,0 ,(LPARAM) "ViewMode.Setup");
+ SendMessage(hwndButton, BUTTONSETID,0 ,(LPARAM) "ViewMode.Setup");
SendMessage(hwndButton, BUTTONSETASFLATBTN, TRUE, 0 );
SendMessage(hwndButton, MBM_UPDATETRANSPARENTFLAG, 0, 2);
- hwndButton = CreateWindow( MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20,
+ hwndButton = CreateWindow( MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20,
hwnd, (HMENU) IDC_RESETMODES, g_hInst, NULL);
MakeButtonSkinned(hwndButton);
SendMessage(hwndButton, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Clear view mode and return to default display"), BATF_TCHAR);
- SendMessage(hwndButton, BUTTONSETID,0 ,(LPARAM) "ViewMode.Clear");
+ SendMessage(hwndButton, BUTTONSETID,0 ,(LPARAM) "ViewMode.Clear");
SendMessage(hwnd, WM_USER + 100, 0, 0);
SendMessage(hwndButton, BUTTONSETASFLATBTN, TRUE, 0 );
SendMessage(hwndButton, MBM_UPDATETRANSPARENTFLAG, 0, 2);
@@ -1009,22 +1011,22 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM RECT rcCLVMFrame;
HDWP PosBatch = BeginDeferWindowPos(3);
GetClientRect(hwnd, &rcCLVMFrame);
- PosBatch = DeferWindowPos(PosBatch, GetDlgItem(hwnd, IDC_RESETMODES), 0,
+ PosBatch = DeferWindowPos(PosBatch, GetDlgItem(hwnd, IDC_RESETMODES), 0,
rcCLVMFrame.right - 23, 1, 22, 18, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_NOCOPYBITS);
- PosBatch = DeferWindowPos(PosBatch, GetDlgItem(hwnd, IDC_CONFIGUREMODES), 0,
+ PosBatch = DeferWindowPos(PosBatch, GetDlgItem(hwnd, IDC_CONFIGUREMODES), 0,
rcCLVMFrame.right - 45, 1, 22, 18, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_NOCOPYBITS);
- PosBatch = DeferWindowPos(PosBatch, GetDlgItem(hwnd, IDC_SELECTMODE), 0,
+ PosBatch = DeferWindowPos(PosBatch, GetDlgItem(hwnd, IDC_SELECTMODE), 0,
1, 1, rcCLVMFrame.right - 46, 18, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_NOCOPYBITS);
EndDeferWindowPos(PosBatch);
}
break;
case WM_USER + 100:
- SendMessage(GetDlgItem(hwnd, IDC_RESETMODES), MBM_SETICOLIBHANDLE, 0,
+ SendMessage(GetDlgItem(hwnd, IDC_RESETMODES), MBM_SETICOLIBHANDLE, 0,
(LPARAM) RegisterIcolibIconHandle("CLN_CLVM_reset", "Contact List", LPGEN("Reset view mode"), NULL, 0, g_hInst, IDI_RESETVIEW ));
- SendMessage(GetDlgItem(hwnd, IDC_CONFIGUREMODES), MBM_SETICOLIBHANDLE, 0,
- (LPARAM) RegisterIcolibIconHandle("CLN_CLVM_set", "Contact List", LPGEN("Setup view modes"), NULL, 0, g_hInst, IDI_SETVIEW ));
+ SendMessage(GetDlgItem(hwnd, IDC_CONFIGUREMODES), MBM_SETICOLIBHANDLE, 0,
+ (LPARAM) RegisterIcolibIconHandle("CLN_CLVM_set", "Contact List", LPGEN("Setup view modes"), NULL, 0, g_hInst, IDI_SETVIEW ));
{
for (int i=0; _buttons[i] != 0; i++) {
@@ -1053,7 +1055,7 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case WM_NCPAINT:
case WM_PAINT:
- if (GetParent(hwnd) == pcli->hwndContactList && g_CluiData.fLayered)
+ if (GetParent(hwnd) == pcli->hwndContactList && g_CluiData.fLayered)
ValidateRect(hwnd,NULL);
else if (GetParent(hwnd) != pcli->hwndContactList || !g_CluiData.fLayered) {
@@ -1077,7 +1079,7 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM }
else ske_BltBackImage(hwnd,hdc2,&rc);
- DrawViewModeBar(hwnd,hdc2);
+ DrawViewModeBar(hwnd,hdc2);
}
for (int i=0; _buttons[i] != 0; i++) {
@@ -1205,7 +1207,7 @@ static BOOL sttDrawViewModeBackground(HWND hwnd, HDC hdc, RECT *rect) {
BOOL bFloat = (GetParent(hwnd) != pcli->hwndContactList);
if (g_CluiData.fDisableSkinEngine || !g_CluiData.fLayered || bFloat)
- {
+ {
RECT rc;
if (rect) rc = *rect;
@@ -1282,7 +1284,7 @@ void CreateViewModeFrame() frame.align = alBottom;
frame.hWnd = CreateWindowEx(0, _T("CLVMFrameWindow"), _T(CLVM_MODULE), WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPCHILDREN, 0, 0, 20, 20, pcli->hwndContactList, (HMENU) 0, g_hInst, NULL);
g_hwndViewModeFrame = frame.hWnd;
- hCLVMFrame = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&frame,0);
+ hCLVMFrame = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&frame,0);
CallService(MS_CLIST_FRAMES_UPDATEFRAME, (WPARAM)hCLVMFrame, FU_FMPOS);
CallService(MS_SKINENG_REGISTERPAINTSUB,(WPARAM)frame.hWnd,(LPARAM)ViewModePaintCallbackProc); //$$$$$ register sub for frame
@@ -1391,7 +1393,7 @@ void ApplyViewMode(const char *Name, bool onlySelector ) db_set_s(NULL, CLVM_MODULE, szSetting, name);
}
strncpy(g_CluiData.current_viewmode, name, 256);
- g_CluiData.current_viewmode[255] = 0;
+ g_CluiData.current_viewmode[255] = 0;
if (g_CluiData.filterFlags & CLVM_USELASTMSG)
{
diff --git a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp index c62eee2855..fbd643a2c4 100644 --- a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_mw/src/clc.cpp b/plugins/Clist_mw/src/clc.cpp index 96e34af520..4e52391f1f 100644 --- a/plugins/Clist_mw/src/clc.cpp +++ b/plugins/Clist_mw/src/clc.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -98,11 +99,11 @@ static int ClcSettingChanged(WPARAM wParam, LPARAM lParam) if ((HANDLE)wParam != NULL && !strcmp(cws->szModule,"MetaContacts") && !strcmp(cws->szSetting,"Handle"))
pcli->pfnClcBroadcast( INTM_NAMEORDERCHANGED, 0, 0 );
-
+
if ((HANDLE)wParam != NULL && !strcmp(cws->szModule,"CList")) {
if ( !strcmp( cws->szSetting, "noOffline" ))
pcli->pfnClcBroadcast( INTM_NAMEORDERCHANGED, wParam, lParam );
- else if ( !strcmp(cws->szSetting,"StatusMsg"))
+ else if ( !strcmp(cws->szSetting,"StatusMsg"))
pcli->pfnClcBroadcast( INTM_STATUSMSGCHANGED, wParam, lParam );
}
return 0;
@@ -127,7 +128,7 @@ static int ClcShutdown(WPARAM wParam, LPARAM lParam) }
LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
+{
struct ClcData *dat = (struct ClcData*)GetWindowLongPtr(hwnd,0);
if ( msg >= CLM_FIRST && msg < CLM_LAST )
return pcli->pfnProcessExternalMessages(hwnd,dat,msg,wParam,lParam);
@@ -140,7 +141,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L break;
case INTM_ICONCHANGED:
- {
+ {
int recalcScrollBar = 0,shouldShow;
HANDLE hSelItem = NULL;
struct ClcContact *selcontact = NULL;
@@ -154,30 +155,30 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L status = ID_STATUS_OFFLINE;
else
status = cacheEntry->status;
-
+
shouldShow = (GetWindowLongPtr(hwnd,GWL_STYLE)&CLS_SHOWHIDDEN || !cacheEntry->bIsHidden) && (!pcli->pfnIsHiddenMode(dat,status)||cacheEntry->noHiddenOffline || CallService(MS_CLIST_GETCONTACTICON,wParam,0) != LOWORD(lParam)); //this means an offline msg is flashing, so the contact should be shown
ClcContact *contact;
ClcGroup *group;
- if ( !FindItem(hwnd, dat, (HANDLE)wParam, &contact, &group, NULL)) {
+ if ( !FindItem(hwnd, dat, (HANDLE)wParam, &contact, &group, NULL)) {
if (shouldShow && CallService(MS_DB_CONTACT_IS, wParam, 0)) {
if (dat->selection>=0 && GetRowByIndex(dat,dat->selection,&selcontact,NULL) != -1)
hSelItem = pcli->pfnContactToHItem(selcontact);
AddContactToTree(hwnd,dat,(HANDLE)wParam,0,0);
needsResort = 1;
- recalcScrollBar = 1;
+ recalcScrollBar = 1;
FindItem(hwnd,dat,(HANDLE)wParam,&contact,NULL,NULL);
- if (contact) {
+ if (contact) {
contact->iImage = (WORD)lParam;
pcli->pfnNotifyNewContact(hwnd,(HANDLE)wParam);
dat->needsResort = 1;
}
- }
+ }
}
else {
//item in list already
- DWORD style = GetWindowLongPtr(hwnd,GWL_STYLE);
- if (contact->iImage == (WORD)lParam) break;
+ DWORD style = GetWindowLongPtr(hwnd,GWL_STYLE);
+ if (contact->iImage == (WORD)lParam) break;
if (sortByStatus) dat->needsResort = 1;
if ( !shouldShow && !(style & CLS_NOHIDEOFFLINE) && (style & CLS_HIDEOFFLINE || group->hideOffline)) {
@@ -205,11 +206,11 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L }
SortClcByTimer(hwnd);
- if (recalcScrollBar) RecalcScrollBar(hwnd,dat);
+ if (recalcScrollBar) RecalcScrollBar(hwnd,dat);
goto LBL_Exit;
}
case INTM_STATUSMSGCHANGED:
- {
+ {
DBVARIANT dbv;
if ( !(dat->style & CLS_SHOWSTATUSMESSAGES))
@@ -250,7 +251,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L break;
}
- if ( wParam == TIMERID_SUBEXPAND) {
+ if ( wParam == TIMERID_SUBEXPAND) {
KillTimer(hwnd,TIMERID_SUBEXPAND);
if (hitcontact) {
if (hitcontact->SubExpanded) hitcontact->SubExpanded = 0; else hitcontact->SubExpanded = 1;
@@ -258,10 +259,10 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L }
hitcontact = NULL;
dat->needsResort = 1;
- SortCLC(hwnd,dat,1);
+ SortCLC(hwnd,dat,1);
RecalcScrollBar(hwnd,dat);
break;
- }
+ }
break;
case WM_DESTROY:
@@ -287,7 +288,7 @@ int LoadCLCModule(void) LoadCLUIFramesModule();
himlCListClc = (HIMAGELIST)CallService(MS_CLIST_GETICONSIMAGELIST,0,0);
-
+
HookEvent(ME_SYSTEM_MODULESLOADED,ClcModulesLoaded);
hSettingChanged1 = HookEvent(ME_DB_CONTACT_SETTINGCHANGED, ClcSettingChanged);
HookEvent(ME_OPT_INITIALISE,ClcOptInit);
diff --git a/plugins/Clist_mw/src/clc.h b/plugins/Clist_mw/src/clc.h index 58dea44696..09b2981ccc 100644 --- a/plugins/Clist_mw/src/clc.h +++ b/plugins/Clist_mw/src/clc.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_mw/src/clcfonts.cpp b/plugins/Clist_mw/src/clcfonts.cpp index a5baeb4970..90b7afb9f8 100644 --- a/plugins/Clist_mw/src/clcfonts.cpp +++ b/plugins/Clist_mw/src/clcfonts.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2010 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-10 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -24,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "commonheaders.h"
-static const TCHAR *szClistFontIdDescr[FONTID_MAX+1] =
+static const TCHAR *szClistFontIdDescr[FONTID_MAX+1] =
{
LPGENT( "Standard contacts"),
LPGENT( "Online contacts to whom you have a different visibility"),
@@ -39,7 +40,7 @@ static const TCHAR *szClistFontIdDescr[FONTID_MAX+1] = LPGENT( "Hover Contacts")
};
-static int fontListOrder[FONTID_MAX + 1] =
+static int fontListOrder[FONTID_MAX + 1] =
{
FONTID_CONTACTS,
FONTID_INVIS,
diff --git a/plugins/Clist_mw/src/clcidents.cpp b/plugins/Clist_mw/src/clcidents.cpp index 45987be54f..a5953b1046 100644 --- a/plugins/Clist_mw/src/clcidents.cpp +++ b/plugins/Clist_mw/src/clcidents.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -90,7 +91,7 @@ ClcCacheEntry *GetCLCFullCacheEntry(struct ClcData *dat,HANDLE hContact) if (pdnce == NULL) {
pdnce = (ClcCacheEntry*)mir_calloc(sizeof(ClcCacheEntry));
pdnce->hContact = hContact;
-
+
int idx;
List_GetIndex(&dat->lCLCContactsCache,pdnce,&idx);
List_Insert(&dat->lCLCContactsCache,pdnce,idx);
@@ -117,12 +118,12 @@ void ClearClcContactCache(struct ClcData *dat,HANDLE hContact) for (i = 0;i<(dat->lCLCContactsCache.realCount);i++) {
ClcCacheEntry *pdnce = (ClcCacheEntry *)dat->lCLCContactsCache.items[i];
pdnce->ClcContact = NULL;
- }
+ }
tick = GetTickCount()-tick;
{
char buf[256];
mir_snprintf(buf, SIZEOF(buf), "Clear full cache %d ms\r\n", tick);
- OutputDebugStringA(buf);
+ OutputDebugStringA(buf);
}
}
if ( !IsHContactGroup(hContact) && !IsHContactInfo(hContact)) {
@@ -163,9 +164,9 @@ int FindItem(HWND hwnd,struct ClcData *dat,HANDLE hItem,struct ClcContact **cont if (ret == 0) {return 0;}
cacheEntry->ClcContact = (void *)z;
}
-
+
if (cacheEntry->ClcContact != NULL) {
- if (contact != NULL)
+ if (contact != NULL)
*contact = (struct ClcContact *)cacheEntry->ClcContact;
return 1;
@@ -181,11 +182,11 @@ int FindItem(HWND hwnd,struct ClcData *dat,HANDLE hItem,struct ClcContact **cont group = group->parent;
if (group == NULL)
break;
-
+
nowVisible = 1;
for (tgroup = group;tgroup;tgroup = tgroup->parent)
if ( !group->expanded) {
- nowVisible = 0;
+ nowVisible = 0;
break;
}
@@ -215,7 +216,7 @@ int FindItem(HWND hwnd,struct ClcData *dat,HANDLE hItem,struct ClcContact **cont if (group->cl.items[group->scanIndex]->type == CLCIT_CONTACT &&
group->cl.items[group->scanIndex]->SubAllocated>0)
for (i = 1; i<=group->cl.items[group->scanIndex]->SubAllocated; i++)
- if (IsHContactContact(hItem) && group->cl.items[group->scanIndex]->subcontacts[i-1].hContact == hItem) {
+ if (IsHContactContact(hItem) && group->cl.items[group->scanIndex]->subcontacts[i-1].hContact == hItem) {
if (contact) *contact = &group->cl.items[group->scanIndex]->subcontacts[i-1];
if (subgroup) *subgroup = group;
return 1;
@@ -262,7 +263,7 @@ int GetRowByIndex(struct ClcData *dat,int testindex,struct ClcContact **contact, group->scanIndex++;
continue;
}
- if ((index>0) && (index<CacheArrSize))
+ if ((index>0) && (index<CacheArrSize))
{
CacheIndex[index] = group;
CacheIndexClear = FALSE;
@@ -290,7 +291,7 @@ int GetRowByIndex(struct ClcData *dat,int testindex,struct ClcContact **contact, }
}
}
-
+
index++;
if ((group->cl.items[group->scanIndex]->type == CLCIT_CONTACT) && (group->cl.items[group->scanIndex]->flags & CONTACTF_STATUSMSG))
index++;
diff --git a/plugins/Clist_mw/src/clcitems.cpp b/plugins/Clist_mw/src/clcitems.cpp index ac35462c4b..6f66fec4c2 100644 --- a/plugins/Clist_mw/src/clcitems.cpp +++ b/plugins/Clist_mw/src/clcitems.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -52,7 +53,7 @@ void AddSubcontacts(struct ClcContact * cont) i = 0;
for (j = 0; j<subcount; j++) {
hsub = (HANDLE)CallService(MS_MC_GETSUBCONTACT,(WPARAM)cont->hContact,j);
- cacheEntry = GetContactFullCacheEntry(hsub);
+ cacheEntry = GetContactFullCacheEntry(hsub);
if ( !(db_get_b(NULL,"CLC","MetaHideOfflineSub",1) && db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT)) ||
cacheEntry->status != ID_STATUS_OFFLINE )
{
@@ -89,7 +90,7 @@ int AddItemToGroup(ClcGroup *group,int iAboveItem) ClcGroup *AddGroup(HWND hwnd,struct ClcData *dat,const TCHAR *szName,DWORD flags,int groupId,int calcTotalMembers)
{
- ClearRowByIndexCache();
+ ClearRowByIndexCache();
dat->needsResort = 1;
ClcGroup *result = saveAddGroup( hwnd, dat, szName, flags, groupId, calcTotalMembers);
ClearRowByIndexCache();
@@ -117,9 +118,9 @@ static struct ClcContact * AddContactToGroup(struct ClcData *dat,ClcGroup *group HANDLE hContact;
DBVARIANT dbv;
int i;
- int img = -1;
+ int img = -1;
int basicIcon = 0;
-
+
if (cacheEntry == NULL || group == NULL || dat == NULL)
return NULL;
@@ -141,10 +142,10 @@ static struct ClcContact * AddContactToGroup(struct ClcData *dat,ClcGroup *group img = CallService(MS_CLIST_GETCONTACTICON,(WPARAM)hContact,0);
group->cl.items[i]->iImage = img;
-
+
cacheEntry = GetContactFullCacheEntry(hContact);
group->cl.items[i]->hContact = hContact;
-
+
//cacheEntry->ClcContact = &(group->cl.items[i]);
//SetClcContactCacheItem(dat,hContact,&(group->cl.items[i]));
@@ -175,7 +176,7 @@ static struct ClcContact * AddContactToGroup(struct ClcData *dat,ClcGroup *group if (group->cl.items[i]->szStatusMsg[0] != 0) {
group->cl.items[i]->flags |= CONTACTF_STATUSMSG;
}
- }
+ }
}
ClearRowByIndexCache();
@@ -192,11 +193,11 @@ void AddContactToTree(HWND hwnd, ClcData *dat, HANDLE hContact, int updateTotalC return;
char *szProto = cacheEntry->szProto;
-
+
dat->needsResort = 1;
ClearRowByIndexCache();
ClearClcContactCache(dat,hContact);
-
+
WORD status;
DWORD style = GetWindowLongPtr(hwnd,GWL_STYLE);
if (style & CLS_NOHIDEOFFLINE) checkHideOffline = 0;
@@ -219,7 +220,7 @@ void AddContactToTree(HWND hwnd, ClcData *dat, HANDLE hContact, int updateTotalC if (checkHideOffline && pcli->pfnIsHiddenMode(dat,status)) {
for (i = 1;;i++) {
TCHAR *szGroupName = pcli->pfnGetGroupName(i, &groupFlags);
- if (szGroupName == NULL)
+ if (szGroupName == NULL)
return; //never happens
if ( !lstrcmp(szGroupName,cacheEntry->tszGroup))
break;
@@ -229,7 +230,7 @@ void AddContactToTree(HWND hwnd, ClcData *dat, HANDLE hContact, int updateTotalC }
for (i = 1;; i++) {
TCHAR *szGroupName = pcli->pfnGetGroupName(i, &groupFlags);
- if (szGroupName == NULL)
+ if (szGroupName == NULL)
return; //never happens
if ( !lstrcmp(szGroupName,cacheEntry->tszGroup))
break;
@@ -248,7 +249,7 @@ void AddContactToTree(HWND hwnd, ClcData *dat, HANDLE hContact, int updateTotalC }
}
ClcContact *cont = AddContactToGroup(dat,group,cacheEntry);
- if (cont && cont->proto) {
+ if (cont && cont->proto) {
cont->SubAllocated = 0;
if (strcmp(cont->proto,"MetaContacts") == 0)
AddSubcontacts(cont);
@@ -269,7 +270,7 @@ ClcGroup *RemoveItemFromGroup(HWND hwnd,ClcGroup *group,struct ClcContact *conta }
group = saveRemoveItemFromGroup(hwnd, group, contact, updateTotalCount);
-
+
ClearRowByIndexCache();
return group;
}
@@ -279,10 +280,10 @@ void DeleteItemFromTree(HWND hwnd,HANDLE hItem) struct ClcContact *contact;
ClcGroup *group;
struct ClcData *dat = (struct ClcData*)GetWindowLongPtr(hwnd,0);
-
+
ClearRowByIndexCache();
dat->needsResort = 1;
-
+
if ( !FindItem(hwnd,dat,hItem,&contact,&group,NULL)) {
DBVARIANT dbv;
int i,nameOffset;
@@ -302,7 +303,7 @@ void DeleteItemFromTree(HWND hwnd,HANDLE hItem) int len = lstrlen(group->cl.items[i]->szText);
if ( !_tcsncmp(group->cl.items[i]->szText,dbv.ptszVal+nameOffset,len) && (dbv.ptszVal[nameOffset+len] == '\\' || dbv.pszVal[nameOffset+len] == '\0')) {
group->totalMembers--;
- if (dbv.pszVal[nameOffset+len] == '\0')
+ if (dbv.pszVal[nameOffset+len] == '\0')
break;
}
}
@@ -378,7 +379,7 @@ void RebuildEntireList(HWND hwnd,struct ClcData *dat) else cont = AddContactToGroup(dat,group,cacheEntry);
}
}
- if (cont && cont->proto) {
+ if (cont && cont->proto) {
cont->SubAllocated = 0;
if (strcmp(cont->proto,"MetaContacts") == 0)
AddSubcontacts(cont);
@@ -417,7 +418,7 @@ void RebuildEntireList(HWND hwnd,struct ClcData *dat) OutputDebugStringA(buf);
db_set_dw((HANDLE)0,"CLUI","PF:Last RebuildEntireList Time:",tick);
- }
+ }
}
@@ -491,7 +492,7 @@ void SortCLC(HWND hwnd,struct ClcData *dat,int useInsertionSort) {
#ifdef _DEBUG
DWORD tick = GetTickCount();
-#endif
+#endif
int oldSort = dat->needsResort;
saveSortCLC(hwnd, dat, useInsertionSort);
if ( oldSort )
@@ -508,7 +509,7 @@ void SortCLC(HWND hwnd,struct ClcData *dat,int useInsertionSort) db_set_dw((HANDLE)0,"CLUI","PF:Last SortCLC Time:",tick);
}
}
-#endif
+#endif
}
struct SavedContactState_t
@@ -568,7 +569,7 @@ void SaveStateAndRebuildList(HWND hwnd,struct ClcData *dat) savedGroup[savedGroupCount-1].expanded = group->expanded;
continue;
}
- else if (group->cl.items[group->scanIndex]->type == CLCIT_CONTACT) {
+ else if (group->cl.items[group->scanIndex]->type == CLCIT_CONTACT) {
if (++savedContactCount>savedContactAlloced) {
savedContactAlloced += allocstep;
savedContact = (struct SavedContactState_t*)mir_realloc(savedContact,sizeof(struct SavedContactState_t)*savedContactAlloced);
@@ -607,7 +608,7 @@ void SaveStateAndRebuildList(HWND hwnd,struct ClcData *dat) pcli->pfnFreeGroup(&dat->list);
RebuildEntireList(hwnd,dat);
-
+
group = &dat->list;
group->scanIndex = 0;
for (;;) {
@@ -632,7 +633,7 @@ void SaveStateAndRebuildList(HWND hwnd,struct ClcData *dat) memcpy(group->cl.items[group->scanIndex]->iExtraImage, savedContact[i].iExtraImage, sizeof(contact->iExtraImage));
if (savedContact[i].checked)
group->cl.items[group->scanIndex]->flags |= CONTACTF_CHECKED;
- break;
+ break;
}
if (group->cl.items[group->scanIndex]->SubAllocated>0)
{
@@ -642,8 +643,8 @@ void SaveStateAndRebuildList(HWND hwnd,struct ClcData *dat) memcpy(group->cl.items[group->scanIndex]->subcontacts[l].iExtraImage, savedContact[i].iExtraImage, sizeof(contact->iExtraImage));
if (savedContact[i].checked)
group->cl.items[group->scanIndex]->subcontacts[l].flags |= CONTACTF_CHECKED;
- break;
- }
+ break;
+ }
}
}
group->scanIndex++;
@@ -669,7 +670,7 @@ void SaveStateAndRebuildList(HWND hwnd,struct ClcData *dat) //srand(GetTickCount());
-
+
tick = GetTickCount()-tick;
{
char buf[255];
@@ -677,7 +678,7 @@ void SaveStateAndRebuildList(HWND hwnd,struct ClcData *dat) mir_snprintf(buf, SIZEOF(buf), "SaveStateAndRebuildList %d \r\n", tick);
OutputDebugStringA(buf);
- }
+ }
ClearRowByIndexCache();
SendMessage(GetParent(hwnd),WM_NOTIFY,0,(LPARAM)&nm);
}
diff --git a/plugins/Clist_mw/src/clcopts.cpp b/plugins/Clist_mw/src/clcopts.cpp index ef363ef11a..33e6d67d1f 100644 --- a/plugins/Clist_mw/src/clcopts.cpp +++ b/plugins/Clist_mw/src/clcopts.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "commonheaders.h"
#include "clc.h"
@@ -104,7 +106,7 @@ struct CheckBoxValues_t { DWORD style;
TCHAR *szDescr;
};
-static const struct CheckBoxValues_t greyoutValues[] =
+static const struct CheckBoxValues_t greyoutValues[] =
{
{GREYF_UNFOCUS, LPGENT("Not focused") },
{MODEF_OFFLINE, LPGENT("Offline") },
@@ -119,7 +121,7 @@ static const struct CheckBoxValues_t greyoutValues[] = {PF2_ONTHEPHONE, LPGENT("On the phone") }
};
-static const struct CheckBoxValues_t offlineValues[] =
+static const struct CheckBoxValues_t offlineValues[] =
{
{MODEF_OFFLINE, LPGENT("Offline") },
{PF2_ONLINE, LPGENT("Online") },
@@ -321,7 +323,7 @@ static INT_PTR CALLBACK DlgProcStatusBarBkgOpts(HWND hwndDlg, UINT msg, WPARAM w SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_SETCOLOUR,0,db_get_dw(NULL,"StatusBar","BkColour",CLCDEFAULT_BKCOLOUR));
SendDlgItemMessage(hwndDlg,IDC_SELCOLOUR,CPM_SETDEFAULTCOLOUR,0,CLCDEFAULT_SELBKCOLOUR);
SendDlgItemMessage(hwndDlg,IDC_SELCOLOUR,CPM_SETCOLOUR,0,db_get_dw(NULL,"StatusBar","SelBkColour",CLCDEFAULT_SELBKCOLOUR));
- {
+ {
DBVARIANT dbv;
if ( !db_get_s(NULL,"StatusBar","BkBitmap",&dbv)) {
SetDlgItemTextA(hwndDlg,IDC_FILENAME,dbv.pszVal);
@@ -390,7 +392,7 @@ static INT_PTR CALLBACK DlgProcStatusBarBkgOpts(HWND hwndDlg, UINT msg, WPARAM w switch (((LPNMHDR)lParam)->code) {
case PSN_APPLY:
db_set_b(NULL,"StatusBar","UseBitmap",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_BITMAP));
- {
+ {
COLORREF col;
col = SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_GETCOLOUR,0,0);
if (col == CLCDEFAULT_BKCOLOUR) db_unset(NULL,"StatusBar","BkColour");
@@ -448,7 +450,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, char szPath[MAX_PATH];
if ( PathToAbsolute(dbv.pszVal, szPath))
SetDlgItemTextA(hwndDlg,IDC_FILENAME,szPath);
-
+
mir_free(dbv.pszVal);
}
}
@@ -544,4 +546,3 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, }
return FALSE;
}
-
diff --git a/plugins/Clist_mw/src/clcpaint.cpp b/plugins/Clist_mw/src/clcpaint.cpp index f6bd3e34c4..fef2359bd5 100644 --- a/plugins/Clist_mw/src/clcpaint.cpp +++ b/plugins/Clist_mw/src/clcpaint.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -122,7 +123,7 @@ static int GetGeneralisedStatus(void) return status;
}
-static int GetRealStatus(struct ClcContact * contact, int status)
+static int GetRealStatus(struct ClcContact * contact, int status)
{
int i;
char *szProto = contact->proto;
@@ -151,7 +152,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) int grey = 0,groupCountsFontTopShift;
HBRUSH hBrushAlternateGrey = NULL;
POINT pt;
- RECT testrc;
+ RECT testrc;
// yes I know about GetSysColorBrush()
COLORREF tmpbkcolour = dat->bkColour;
@@ -159,10 +160,10 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) if (dat->greyoutFlags & pcli->pfnClcStatusToPf2(status) || style&WS_DISABLED) grey = 1;
else if (GetFocus() != hwnd && dat->greyoutFlags&GREYF_UNFOCUS) grey = 1;
GetClientRect(hwnd,&clRect);
-
+
if (rcPaint == NULL) rcPaint = &clRect;
//rcPaint = &clRect;
-
+
if (IsRectEmpty(rcPaint)) return;
GetCursorPos(&pt);
ScreenToClient(hwnd,&pt);
@@ -172,9 +173,9 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) hdcMem = CreateCompatibleDC(hdc);
hBmpOsb = CreateBitmap(clRect.right,clRect.bottom,1,GetDeviceCaps(hdc,BITSPIXEL),NULL);
oldbmp = (HBITMAP)SelectObject(hdcMem,hBmpOsb);
- {
+ {
oldfont = (HFONT)SelectObject(hdcMem,dat->fontInfo[FONTID_GROUPS].hFont);
-
+
TEXTMETRIC tm;
GetTextMetrics(hdcMem,&tm);
groupCountsFontTopShift = tm.tmAscent;
@@ -292,7 +293,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) SIZE textSize,countsSize,spaceSize;
int width,checkboxWidth;
char *szCounts;
-
+
if (subindex == -1) {
Drawing = group->cl.items[group->scanIndex];
subident = 0;
@@ -305,7 +306,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) selected = index == dat->selection && (dat->showSelAlways || dat->exStyle&CLS_EX_SHOWSELALWAYS || GetFocus() == hwnd) && Drawing->type != CLCIT_DIVIDER;
hottrack = dat->exStyle&CLS_EX_TRACKSELECT && Drawing->type != CLCIT_DIVIDER && dat->iHotTrack == index;
-
+
if (style&CLS_GREYALTERNATE && index&1) {
RECT rc;
rc.top = y; rc.bottom = rc.top+dat->rowHeight;
@@ -315,9 +316,9 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) //setup
if (Drawing->type == CLCIT_GROUP) {
- if (Drawing->group->expanded)
+ if (Drawing->group->expanded)
ChangeToFont(hdcMem,dat,FONTID_GROUPS,&fontHeight);
- else
+ else
ChangeToFont(hdcMem,dat,FONTID_GROUPSCLOSED,&fontHeight);
}
else if (Drawing->type == CLCIT_INFO) {
@@ -328,13 +329,13 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) ChangeToFont(hdcMem,dat,FONTID_DIVIDERS,&fontHeight);
else if (Drawing->type == CLCIT_CONTACT && (Drawing->flags&CONTACTF_NOTONLIST) && (!Drawing->isSubcontact))
ChangeToFont(hdcMem,dat,FONTID_NOTONLIST,&fontHeight);
- else if ( Drawing->type == CLCIT_CONTACT &&
- (
+ else if ( Drawing->type == CLCIT_CONTACT &&
+ (
(Drawing->flags&CONTACTF_INVISTO && (!Drawing->isSubcontact) && GetRealStatus(group->cl.items[group->scanIndex], status) != ID_STATUS_INVISIBLE )
||
(Drawing->flags&CONTACTF_VISTO && (!Drawing->isSubcontact) && GetRealStatus(group->cl.items[group->scanIndex], status) == ID_STATUS_INVISIBLE)
- )
- )
+ )
+ )
{
// the contact is in the always visible list and the proto is invisible
// the contact is in the always invisible and the proto is in any other mode
@@ -367,7 +368,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) // default value - paint on text
int x=dat->leftMargin+indent*dat->groupIndent+checkboxWidth+dat->iconXSpace-2+subident;
ImageList_DrawEx(dat->himlHighlight,0,hdcMem,x,y,min(width+5,clRect.right-x),dat->rowHeight,CLR_NONE,CLR_NONE,dat->exStyle&CLS_EX_NOTRANSLUCENTSEL?ILD_NORMAL:ILD_BLEND25);
- SetTextColor(hdcMem,dat->selTextColour);
+ SetTextColor(hdcMem,dat->selTextColour);
}
else if (hottrack)
SetHotTrackColour(hdcMem,dat);
@@ -436,11 +437,11 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) else TextOutA(hdcMem,rc.right,rc.top+groupCountsFontTopShift,szCounts,lstrlenA(szCounts));
//ChangeToFont(hdcMem,dat,FONTID_GROUPS,&fontHeight);
- if (Drawing->group->expanded)
+ if (Drawing->group->expanded)
{
ChangeToFont(hdcMem,dat,FONTID_GROUPS,&fontHeight);
}
- else
+ else
{
ChangeToFont(hdcMem,dat,FONTID_GROUPSCLOSED,&fontHeight);
}
@@ -489,7 +490,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) }
if (dat->style&CLS_SHOWSTATUSMESSAGES)
- {
+ {
// status message
if (group->cl.items[group->scanIndex]->type == CLCIT_CONTACT && group->cl.items[group->scanIndex]->flags & CONTACTF_STATUSMSG) {
TCHAR * szText = group->cl.items[group->scanIndex]->szStatusMsg;
@@ -501,7 +502,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) ChangeToFont(hdcMem,dat,FONTID_STATUSMSG,&fontHeight);
//ExtTextOut(hdcMem,rc.left,rc.top,ETO_CLIPPED,&rc,szText,lstrlen(szText),NULL);
DrawText(hdcMem, szText, lstrlen(szText), &rc, DT_SINGLELINE | DT_EDITCONTROL | DT_NOPREFIX | DT_NOCLIP | DT_WORD_ELLIPSIS);
- }
+ }
}
if ( !Drawing->isSubcontact || ( db_get_b(NULL,"CLC","MetaHideExtra",0) == 0)) {
@@ -519,7 +520,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) if (selected) mode = ILD_SELECTED;
else if (hottrack) {mode = ILD_FOCUS; colourFg = dat->hotTextColour;}
else if (Drawing->type == CLCIT_CONTACT && Drawing->flags&CONTACTF_NOTONLIST) {colourFg = dat->fontInfo[FONTID_NOTONLIST].colour; mode = ILD_BLEND50;}
- {
+ {
}
if (dat->MetaIgnoreEmptyExtra) c--; else c = iImage;
@@ -535,7 +536,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) }
}
else {
- int ic = 0;
+ int ic = 0;
for (iImage = 0;iImage<dat->extraColumnsCount;iImage++) {
COLORREF colourFg = dat->selBkColour;
int mode = ILD_NORMAL;
@@ -549,7 +550,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) colourFg = dat->hotTextColour;
}
else if (Drawing->type == CLCIT_CONTACT && (Drawing->flags & CONTACTF_NOTONLIST)) {
- colourFg = dat->fontInfo[FONTID_NOTONLIST].colour;
+ colourFg = dat->fontInfo[FONTID_NOTONLIST].colour;
mode = ILD_BLEND50;
}
diff --git a/plugins/Clist_mw/src/clcutils.cpp b/plugins/Clist_mw/src/clcutils.cpp index 4aa7ef72bb..0edfda16ed 100644 --- a/plugins/Clist_mw/src/clcutils.cpp +++ b/plugins/Clist_mw/src/clcutils.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "commonheaders.h"
#include "clc.h"
@@ -82,7 +84,7 @@ int HitTest(HWND hwnd,struct ClcData *dat,int testx,int testy,struct ClcContact if (flags) *flags |= CLCHT_ONITEMICON;
return hit;
}
-
+
hdc = GetDC(hwnd);
GetTextExtentPoint32(hdc,hitcontact->szText,lstrlen(hitcontact->szText),&textSize);
width = textSize.cx;
@@ -94,7 +96,7 @@ int HitTest(HWND hwnd,struct ClcData *dat,int testx,int testy,struct ClcContact if (hitcontact->iExtraImage[i] == EMPTY_EXTRA_ICON)
continue;
- if ((style & CLS_EX_MULTICOLUMNALIGNLEFT)) {
+ if ((style & CLS_EX_MULTICOLUMNALIGNLEFT)) {
x = (dat->leftMargin+indent*dat->groupIndent+checkboxWidth+dat->iconXSpace-2+width);
x += 16;
x = x+dat->extraColumnSpacing*(ic);
@@ -104,7 +106,7 @@ int HitTest(HWND hwnd,struct ClcData *dat,int testx,int testy,struct ClcContact int ir;
if (dat->MetaIgnoreEmptyExtra) {
ir = 0;
- for (int j = i;j<dat->extraColumnsCount;j++)
+ for (int j = i;j<dat->extraColumnsCount;j++)
if (hitcontact->iExtraImage[j] != EMPTY_EXTRA_ICON)
ir++;
}
@@ -120,14 +122,14 @@ int HitTest(HWND hwnd,struct ClcData *dat,int testx,int testy,struct ClcContact ReleaseDC(hwnd,hdc);
return hit;
- }
+ }
}
- if (hitcontact->type == CLCIT_GROUP)
+ if (hitcontact->type == CLCIT_GROUP)
oldfont = (HFONT)SelectObject(hdc,dat->fontInfo[FONTID_GROUPS].hFont);
- else
+ else
oldfont = (HFONT)SelectObject(hdc,dat->fontInfo[FONTID_CONTACTS].hFont);
-
+
GetTextExtentPoint32(hdc,hitcontact->szText,lstrlen(hitcontact->szText),&textSize);
width = textSize.cx;
if (hitcontact->type == CLCIT_GROUP) {
@@ -199,7 +201,7 @@ void RecalcScrollBar(HWND hwnd,struct ClcData *dat) RECT clRect;
NMCLISTCONTROL nm;
boolean sbar = FALSE;
-
+
GetClientRect(hwnd,&clRect);
si.cbSize = sizeof(si);
@@ -208,7 +210,7 @@ void RecalcScrollBar(HWND hwnd,struct ClcData *dat) si.nMax = dat->rowHeight*GetGroupContentsCount(&dat->list,2)-1;
si.nPage = clRect.bottom;
si.nPos = dat->yScroll;
-
+
nm.hdr.code = CLN_LISTSIZECHANGE;
nm.hdr.hwndFrom = hwnd;
nm.hdr.idFrom = GetDlgCtrlID(hwnd);
@@ -224,9 +226,9 @@ void RecalcScrollBar(HWND hwnd,struct ClcData *dat) si.nPos = dat->yScroll;
sbar = (dat->noVScrollbar == 1||(int)si.nPage>si.nMax);
-
+
ShowScrollBar(hwnd,SB_VERT,sbar? FALSE : TRUE);
- if ( !sbar) {
+ if ( !sbar) {
if ( GetWindowLongPtr(hwnd,GWL_STYLE)&CLS_CONTACTLIST ) {
if ( dat->noVScrollbar == 0 ) SetScrollInfo(hwnd,SB_VERT,&si,TRUE);
else SetScrollInfo(hwnd,SB_VERT,&si,FALSE);
@@ -282,6 +284,6 @@ void LoadClcOptions(HWND hwnd,struct ClcData *dat) saveLoadClcOptions( hwnd, dat );
for (i = 0; i <= FONTID_MAX; i++)
- if (dat->fontInfo[i].fontHeight > dat->rowHeight)
+ if (dat->fontInfo[i].fontHeight > dat->rowHeight)
dat->rowHeight = dat->fontInfo[i].fontHeight;
}
diff --git a/plugins/Clist_mw/src/clist.h b/plugins/Clist_mw/src/clist.h index 2736a08f44..e234bbdd10 100644 --- a/plugins/Clist_mw/src/clist.h +++ b/plugins/Clist_mw/src/clist.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#ifndef _CLIST_H_
#define _CLIST_H_
diff --git a/plugins/Clist_mw/src/clistmenus.cpp b/plugins/Clist_mw/src/clistmenus.cpp index 423e58bb26..4b7ee0b425 100644 --- a/plugins/Clist_mw/src/clistmenus.cpp +++ b/plugins/Clist_mw/src/clistmenus.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2006 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-06 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "commonheaders.h"
#pragma hdrstop
diff --git a/plugins/Clist_mw/src/clistmod.cpp b/plugins/Clist_mw/src/clistmod.cpp index a859352a18..99e6edef66 100644 --- a/plugins/Clist_mw/src/clistmod.cpp +++ b/plugins/Clist_mw/src/clistmod.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "commonheaders.h"
extern int DefaultImageListColorDepth;
diff --git a/plugins/Clist_mw/src/clistopts.cpp b/plugins/Clist_mw/src/clistopts.cpp index b85fa0e6a6..42c146af88 100644 --- a/plugins/Clist_mw/src/clistopts.cpp +++ b/plugins/Clist_mw/src/clistopts.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "commonheaders.h"
#include "clist.h"
@@ -58,7 +60,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP }
break;
}
- case WM_DESTROY:
+ case WM_DESTROY:
{
UnhookEvent( (HANDLE)GetWindowLongPtr(hwndDlg,GWLP_USERDATA));
break;
@@ -78,10 +80,10 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP CheckDlgButton(hwndDlg, IDC_HIDEOFFLINE, db_get_b(NULL,"CList","HideOffline",SETTING_HIDEOFFLINE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_HIDEEMPTYGROUPS, db_get_b(NULL,"CList","HideEmptyGroups",SETTING_HIDEEMPTYGROUPS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_DISABLEGROUPS, db_get_b(NULL,"CList","UseGroups",SETTING_USEGROUPS_DEFAULT) ? BST_UNCHECKED : BST_CHECKED);
- CheckDlgButton(hwndDlg, IDC_SORTBYNAME,
+ CheckDlgButton(hwndDlg, IDC_SORTBYNAME,
!db_get_b(NULL,"CList","SortByStatus",SETTING_SORTBYSTATUS_DEFAULT) &&
!db_get_b(NULL,"CList","SortByProto",SETTING_SORTBYPROTO_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);
-
+
CheckDlgButton(hwndDlg, IDC_SORTBYSTATUS, db_get_b(NULL,"CList","SortByStatus",SETTING_SORTBYSTATUS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_NOOFFLINEMOVE, db_get_b(NULL,"CList","NoOfflineBottom",SETTING_NOOFFLINEBOTTOM_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);
@@ -90,7 +92,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP CheckDlgButton(hwndDlg, IDC_AUTOHIDE, db_get_b(NULL,"CList","AutoHide",SETTING_AUTOHIDE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);
EnableWindow(GetDlgItem(hwndDlg,IDC_HIDETIME),IsDlgButtonChecked(hwndDlg,IDC_AUTOHIDE));
EnableWindow(GetDlgItem(hwndDlg,IDC_HIDETIMESPIN),IsDlgButtonChecked(hwndDlg,IDC_AUTOHIDE));
- {
+ {
DWORD caps = CallService(MS_CLUI_GETCAPS,CLUICAPS_FLAGS1,0);
if ( !(caps&CLUIF_HIDEEMPTYGROUPS)) ShowWindow(GetDlgItem(hwndDlg,IDC_HIDEEMPTYGROUPS),SW_HIDE);
if ( !(caps&CLUIF_DISABLEGROUPS)) ShowWindow(GetDlgItem(hwndDlg,IDC_DISABLEGROUPS),SW_HIDE);
@@ -148,7 +150,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP }
if (-1 == (int)SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_GETCURSEL,0,0))
SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_SETCURSEL,0,0);
- SendDlgItemMessage(hwndDlg,IDC_BLINKSPIN,UDM_SETBUDDY,(WPARAM)GetDlgItem(hwndDlg,IDC_BLINKTIME),0); // set buddy
+ SendDlgItemMessage(hwndDlg,IDC_BLINKSPIN,UDM_SETBUDDY,(WPARAM)GetDlgItem(hwndDlg,IDC_BLINKTIME),0); // set buddy
SendDlgItemMessage(hwndDlg,IDC_BLINKSPIN,UDM_SETRANGE,0,MAKELONG(0x3FFF,250));
SendDlgItemMessage(hwndDlg,IDC_BLINKSPIN,UDM_SETPOS,0,MAKELONG(db_get_w(NULL,"CList","IconFlashTime",550),0));
return TRUE;
@@ -186,7 +188,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP switch (((LPNMHDR)lParam)->code) {
case PSN_APPLY:
db_set_b(NULL,"CList","HideOffline",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_HIDEOFFLINE));
- {
+ {
DWORD caps = CallService(MS_CLUI_GETCAPS,CLUICAPS_FLAGS1,0);
if (caps & CLUIF_HIDEEMPTYGROUPS) db_set_b(NULL,"CList","HideEmptyGroups",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_HIDEEMPTYGROUPS));
if (caps & CLUIF_DISABLEGROUPS) db_set_b(NULL,"CList","UseGroups",(BYTE)!IsDlgButtonChecked(hwndDlg,IDC_DISABLEGROUPS));
@@ -217,9 +219,9 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP {
int cursel = SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_GETCURSEL,0,0);
PROTOACCOUNT* pa = (PROTOACCOUNT*)SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_GETITEMDATA,cursel,0);
- if ( pa == NULL )
+ if ( pa == NULL )
db_unset(NULL, "CList","PrimaryStatus");
- else
+ else
db_set_s(NULL,"CList","PrimaryStatus", pa->szModuleName);
}
pcli->pfnTrayIconIconsChanged();
diff --git a/plugins/Clist_mw/src/clistsettings.cpp b/plugins/Clist_mw/src/clistsettings.cpp index bc810e7d12..7e6b081d80 100644 --- a/plugins/Clist_mw/src/clistsettings.cpp +++ b/plugins/Clist_mw/src/clistsettings.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "commonheaders.h"
#include "clist.h"
@@ -66,7 +68,7 @@ void FreeDisplayNameCache(SortedList *list) FreeDisplayNameCacheItem((ClcCacheEntry*)list->items[i] );
mir_free(list->items[i]);
}
-
+
List_Destroy(list);
}
@@ -78,7 +80,7 @@ void CheckPDNCE(ClcCacheEntry *_pdnce) if (pdnce->szProto == NULL && pdnce->protoNotExists == FALSE) {
pdnce->szProto = GetProtoForContact(pdnce->hContact);
- if (pdnce->szProto == NULL)
+ if (pdnce->szProto == NULL)
pdnce->protoNotExists = FALSE;
else {
if (CallService(MS_PROTO_ISPROTOCOLLOADED,0,(LPARAM)pdnce->szProto) == 0)
@@ -90,7 +92,7 @@ void CheckPDNCE(ClcCacheEntry *_pdnce) } } } }
if (pdnce->tszName == NULL)
- {
+ {
if (pdnce->protoNotExists)
pdnce->tszName = mir_tstrdup(TranslateT("_NoProtocol_"));
else {
@@ -98,7 +100,7 @@ void CheckPDNCE(ClcCacheEntry *_pdnce) pdnce->tszName = GetNameForContact(pdnce->hContact,0,&pdnce->isUnknown);
else
pdnce->tszName = GetNameForContact(pdnce->hContact,0,NULL);
- }
+ }
}
else {
if (pdnce->isUnknown&&pdnce->szProto&&pdnce->protoNotExists == TRUE&&OnModulesLoadedCalled) {
@@ -124,7 +126,7 @@ void CheckPDNCE(ClcCacheEntry *_pdnce) if (pdnce->bIsHidden == -1)
pdnce->bIsHidden = db_get_b(pdnce->hContact,"CList","Hidden",0);
-
+
if (pdnce->noHiddenOffline == -1)
pdnce->noHiddenOffline = db_get_b(pdnce->hContact,"CList","noOffline",0);
@@ -133,7 +135,7 @@ void CheckPDNCE(ClcCacheEntry *_pdnce) if (pdnce->ApparentMode == -1)
pdnce->ApparentMode = db_get_w(pdnce->hContact,pdnce->szProto,"ApparentMode",0);
-
+
if (pdnce->NotOnList == -1)
pdnce->NotOnList = db_get_b(pdnce->hContact,"CList","NotOnList",0);
@@ -147,7 +149,7 @@ void InvalidateDisplayNameCacheEntryByPDNE(HANDLE hContact,ClcCacheEntry *pdnce, return;
if ( SettingType == -1 || SettingType == DBVT_DELETED )
- {
+ {
mir_free(pdnce->tszName);
pdnce->tszName = NULL;
mir_free(pdnce->tszGroup);
@@ -193,7 +195,7 @@ void InvalidateDisplayNameCacheEntryByPDNE(HANDLE hContact,ClcCacheEntry *pdnce, char *GetContactCachedProtocol(HANDLE hContact)
{
ClcCacheEntry *cacheEntry = (ClcCacheEntry *)pcli->pfnGetCacheEntry(hContact);
- if (cacheEntry&&cacheEntry->szProto)
+ if (cacheEntry&&cacheEntry->szProto)
return cacheEntry->szProto;
return NULL;
@@ -263,7 +265,7 @@ int GetContactCachedStatus(HANDLE hContact) {
ClcCacheEntry *cacheEntry = (ClcCacheEntry *)pcli->pfnGetCacheEntry(hContact);
if (cacheEntry&&cacheEntry->status != 0) return cacheEntry->status;
- return 0;
+ return 0;
}
int ContactSettingChanged(WPARAM wParam,LPARAM lParam)
@@ -275,7 +277,7 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam) if (hContact == NULL)
return 0;
- __try
+ __try
{
ClcCacheEntry *pdnce = (ClcCacheEntry *)pcli->pfnGetCacheEntry(hContact);
if (pdnce == NULL) {
@@ -287,11 +289,11 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam) if ( !strcmp(cws->szModule,pdnce->szProto)) {
InvalidateDisplayNameCacheEntryByPDNE(hContact,pdnce,cws->value.type);
- if (cws->value.type == DBVT_WORD && !strcmp(cws->szSetting, "Status")) {
+ if (cws->value.type == DBVT_WORD && !strcmp(cws->szSetting, "Status")) {
if ( !(pdnce->bIsHidden == 1)) {
if ( db_get_b((HANDLE)NULL,"CList","ShowStatusMsg",0)||db_get_b(hContact,"CList","StatusMsgAuto",0))
- db_set_s(hContact, "CList", "StatusMsg", "");
+ db_set_s(hContact, "CList", "StatusMsg", "");
if ( db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT)) {
// User's state is changing, and we are hideOffline-ing
@@ -322,7 +324,7 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam) InvalidateDisplayNameCacheEntryByPDNE(hContact,pdnce,cws->value.type);
if ( !strcmp(cws->szSetting,"Hidden")) {
- InvalidateDisplayNameCacheEntryByPDNE(hContact,pdnce,cws->value.type);
+ InvalidateDisplayNameCacheEntryByPDNE(hContact,pdnce,cws->value.type);
if (cws->value.type == DBVT_DELETED || cws->value.bVal == 0) {
char *szProto = GetContactProto((HANDLE)wParam);
ChangeContactIcon(hContact,ExtIconFromStatusMode(hContact, szProto, szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE)), 1); //by FYR
@@ -336,15 +338,15 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam) if ( !strcmp(cws->szModule, "Protocol")) {
if ( !strcmp(cws->szSetting,"p")) {
OutputDebugStringA("CHANGE: proto\r\n");
- InvalidateDisplayNameCacheEntryByPDNE(hContact, pdnce, cws->value.type);
+ InvalidateDisplayNameCacheEntryByPDNE(hContact, pdnce, cws->value.type);
char *szProto = (cws->value.type == DBVT_DELETED) ? NULL : cws->value.pszVal;
ChangeContactIcon(hContact, ExtIconFromStatusMode(hContact, szProto, szProto == NULL?ID_STATUS_OFFLINE:db_get_w(hContact,szProto,"Status",ID_STATUS_OFFLINE)),0); //by FYR
}
}
- }
- __except (exceptFunction(GetExceptionInformation()))
- {
- }
+ }
+ __except (exceptFunction(GetExceptionInformation()))
+ {
+ }
return 0;
}
diff --git a/plugins/Clist_mw/src/clisttray.cpp b/plugins/Clist_mw/src/clisttray.cpp index 65ff0b8cec..8e5a309dee 100644 --- a/plugins/Clist_mw/src/clisttray.cpp +++ b/plugins/Clist_mw/src/clisttray.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "commonheaders.h"
#include "m_clui.h"
diff --git a/plugins/Clist_mw/src/clui.cpp b/plugins/Clist_mw/src/clui.cpp index c8c22f6cc8..9e8882ec55 100644 --- a/plugins/Clist_mw/src/clui.cpp +++ b/plugins/Clist_mw/src/clui.cpp @@ -1,25 +1,27 @@ /*
- Miranda IM: the free IM client for Microsoft* Windows*
-
- Copyright 2000-2003 Miranda ICQ/IM project,
- all portions of this codebase are copyrighted to the people
- listed in contributors.txt.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "commonheaders.h"
#define TM_AUTOALPHA 1
diff --git a/plugins/Clist_mw/src/cluiopts.cpp b/plugins/Clist_mw/src/cluiopts.cpp index f623a7adb7..be38c3ef31 100644 --- a/plugins/Clist_mw/src/cluiopts.cpp +++ b/plugins/Clist_mw/src/cluiopts.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "commonheaders.h"
extern HMENU hMenuMain;
@@ -69,7 +71,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L EnableWindow(GetDlgItem(hwndDlg,IDC_TITLETEXT),FALSE);
}
CheckDlgButton(hwndDlg, IDC_FADEINOUT, db_get_b(NULL,"CLUI","FadeInOut",0) ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwndDlg, IDC_AUTOSIZE, db_get_b(NULL,"CLUI","AutoSize",0) ? BST_CHECKED : BST_UNCHECKED);
+ CheckDlgButton(hwndDlg, IDC_AUTOSIZE, db_get_b(NULL,"CLUI","AutoSize",0) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_DROPSHADOW, db_get_b(NULL,"CList","WindowShadow",0) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_ONDESKTOP, db_get_b(NULL,"CList","OnDesktop", 0) ? BST_CHECKED : BST_UNCHECKED);
SendDlgItemMessage(hwndDlg,IDC_MAXSIZESPIN,UDM_SETRANGE,0,MAKELONG(100,0));
@@ -104,7 +106,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L }
if (s)
- {
+ {
SetDlgItemTextA(hwndDlg,IDC_TITLETEXT,s);
mir_free(s);
}
@@ -317,14 +319,14 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L EnableWindow(GetDlgItem(hwndDlg,IDC_EQUALSECTIONS),IsDlgButtonChecked(hwndDlg,IDC_SHOWSBAR));
EnableWindow(GetDlgItem(hwndDlg,IDC_SBPANELBEVEL),IsDlgButtonChecked(hwndDlg,IDC_SHOWSBAR));
EnableWindow(GetDlgItem(hwndDlg,IDC_SHOWSIZEGRIP),IsDlgButtonChecked(hwndDlg,IDC_SHOWSBAR));
- EnableWindow(GetDlgItem(hwndDlg,IDC_USECONNECTINGICON),IsDlgButtonChecked(hwndDlg,IDC_SHOWSBAR));
- EnableWindow(GetDlgItem(hwndDlg,IDC_USEOWNERDRAW),IsDlgButtonChecked(hwndDlg,IDC_SHOWSBAR));
+ EnableWindow(GetDlgItem(hwndDlg,IDC_USECONNECTINGICON),IsDlgButtonChecked(hwndDlg,IDC_SHOWSBAR));
+ EnableWindow(GetDlgItem(hwndDlg,IDC_USEOWNERDRAW),IsDlgButtonChecked(hwndDlg,IDC_SHOWSBAR));
}
if (LOWORD(wParam) == IDC_DEFBKCOLOR)
{
SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_SETCOLOUR,0,CLR_DEFAULT);
- SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
+ SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
}
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
@@ -361,7 +363,7 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L SendMessage(pcli->hwndContactList,WM_SIZE,0,0);
OnStatusBarBackgroundChange();
- CluiProtocolStatusChanged(0,0);
+ CluiProtocolStatusChanged(0,0);
return TRUE;
}
}
diff --git a/plugins/Clist_mw/src/cluiservices.cpp b/plugins/Clist_mw/src/cluiservices.cpp index 554a7958a7..4fc0066b1e 100644 --- a/plugins/Clist_mw/src/cluiservices.cpp +++ b/plugins/Clist_mw/src/cluiservices.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "commonheaders.h"
extern int CreateTimerForConnectingIcon(WPARAM,LPARAM);
@@ -66,7 +68,7 @@ void CluiProtocolStatusChanged(int parStatus, const char* szProto) SendMessage(pcli->hwndStatus,SB_SETBKCOLOR,0,db_get_dw(0,"CLUI","SBarBKColor",CLR_DEFAULT));
partWidths = (int*)alloca((protoCount+1)*sizeof(int));
//partWidths[0] = FirstIconOffset;
- if ( db_get_b(NULL,"CLUI","UseOwnerDrawStatusBar",0)||db_get_b(NULL,"CLUI","EqualSections",1))
+ if ( db_get_b(NULL,"CLUI","UseOwnerDrawStatusBar",0)||db_get_b(NULL,"CLUI","EqualSections",1))
{
RECT rc;
int toshow, part;
@@ -133,7 +135,7 @@ void CluiProtocolStatusChanged(int parStatus, const char* szProto) GetTextExtentPoint32(hdc, szStatus, (int)_tcslen(szStatus), &textSize);
x += textSize.cx;
}
- if (showOpts&6) x += 2;
+ if (showOpts&6) x += 2;
partWidths[partCount] = (partCount?partWidths[partCount-1]:startoffset)+x+extraspace;
partCount++;
}
diff --git a/plugins/Clist_mw/src/commonheaders.h b/plugins/Clist_mw/src/commonheaders.h index 315f5e6605..2a52b421a5 100644 --- a/plugins/Clist_mw/src/commonheaders.h +++ b/plugins/Clist_mw/src/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2004 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-04 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#define _CRT_SECURE_NO_WARNINGS
#ifndef _COMMON_HEADERS_H_
#define _COMMON_HEADERS_H_ 1
diff --git a/plugins/Clist_mw/src/contact.cpp b/plugins/Clist_mw/src/contact.cpp index 9a818226e1..095998689e 100644 --- a/plugins/Clist_mw/src/contact.cpp +++ b/plugins/Clist_mw/src/contact.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "commonheaders.h"
#include "m_clui.h"
#include "clist.h"
@@ -48,7 +50,7 @@ struct { static int GetContactStatus(HANDLE hContact)
{
/*
-
+
char *szProto;
szProto = GetContactProto(hContact,0);
@@ -100,7 +102,7 @@ void LoadContactTree(void) sortNoOfflineBottom = db_get_b(NULL,"CList","NoOfflineBottom",SETTING_NOOFFLINEBOTTOM_DEFAULT);
CallService(MS_CLUI_LISTENDREBUILD,0,0);
-
+
tick = GetTickCount()-tick;
char buf[255];
@@ -124,7 +126,7 @@ int CompareContacts( const struct ClcContact *contact1, const struct ClcContact if (sortByProto) {
/* deal with statuses, online contacts have to go above offline */
- if (sortNoOfflineBottom == 0)
+ if (sortNoOfflineBottom == 0)
if ((statusa == ID_STATUS_OFFLINE) != (statusb == ID_STATUS_OFFLINE)) {
return 2*(statusa == ID_STATUS_OFFLINE)-1;
}
@@ -132,7 +134,7 @@ int CompareContacts( const struct ClcContact *contact1, const struct ClcContact rc = strcmp(SAFESTRING(szProto1),SAFESTRING(szProto2)); /* strcmp() doesn't like NULL so feed in "" as needed */
if (rc != 0 && (szProto1 != NULL && szProto2 != NULL)) return rc;
/* protocols are the same, order by display name */
- }
+ }
if (sortByStatus) {
int ordera,orderb;
diff --git a/plugins/Clist_mw/src/groupmenu.cpp b/plugins/Clist_mw/src/groupmenu.cpp index c6fd1ea357..fdd3af5b08 100644 --- a/plugins/Clist_mw/src/groupmenu.cpp +++ b/plugins/Clist_mw/src/groupmenu.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "commonheaders.h"
#include "m_clui.h"
#include "clist.h"
@@ -72,7 +74,7 @@ static INT_PTR BuildGroupMenu(WPARAM wParam,LPARAM lParam) hMenu = CreatePopupMenu();
//hMenu = wParam;
tick = GetTickCount();
-
+
NotifyEventHooks(hPreBuildGroupMenuEvent,0,0);
CallService(MO_BUILDMENU,(WPARAM)hMenu,(LPARAM)¶m);
@@ -87,11 +89,11 @@ static INT_PTR AddGroupMenuItem(WPARAM wParam,LPARAM lParam) CLISTMENUITEM *mi = (CLISTMENUITEM*)lParam;
if ( !pcli->pfnConvertMenu(mi, &tmi))
return 0;
-
+
lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)mir_calloc(sizeof(GroupMenuExecParam));
if (mmep == NULL)
return 0;
-
+
//we need just one parametr.
mmep->szServiceName = mir_strdup(mi->pszService);
mmep->Param1 = mi->popupPosition;
@@ -107,7 +109,7 @@ static INT_PTR AddGroupMenuItem(WPARAM wParam,LPARAM lParam) OptParam op;
op.Handle = (HANDLE)CallService(MO_ADDNEWMENUITEM,(WPARAM)hGroupMenuObject,(LPARAM)&tmi);
- op.Setting = OPT_MENUITEMSETUNIQNAME;
+ op.Setting = OPT_MENUITEMSETUNIQNAME;
op.Value = (INT_PTR)buf;
CallService(MO_SETOPTIONSMENUITEM,0,(LPARAM)&op);
return (INT_PTR)op.Handle;
@@ -133,14 +135,14 @@ INT_PTR GroupMenuonAddService(WPARAM wParam,LPARAM lParam) { if (hGroupMainMenuItemProxy == (HANDLE)lParam) {
mii->fMask |= MIIM_SUBMENU;
- mii->hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETMAIN,0,0);
+ mii->hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETMAIN,0,0);
}
if (hGroupStatusMenuItemProxy == (HANDLE)lParam) {
mii->fMask |= MIIM_SUBMENU;
- mii->hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETSTATUS,0,0);
+ mii->hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETSTATUS,0,0);
}
-
+
return TRUE;
}
@@ -150,17 +152,17 @@ INT_PTR GroupMenuonAddService(WPARAM wParam,LPARAM lParam) { INT_PTR GroupMenuExecService(WPARAM wParam,LPARAM lParam) {
if (wParam != 0)
{
- lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)wParam;
+ lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)wParam;
if ( !strcmp(mmep->szServiceName,"Help/AboutCommand"))
{
//bug in help.c,it used wparam as parent window handle without reason.
mmep->Param1 = 0;
- CallService(mmep->szServiceName,mmep->Param1,lParam);
+ CallService(mmep->szServiceName,mmep->Param1,lParam);
}else
{
- CallService(mmep->szServiceName,mmep->Param1,mmep->Param2);
+ CallService(mmep->szServiceName,mmep->Param1,mmep->Param2);
}
-
+
}
return(1);
}
@@ -184,7 +186,7 @@ INT_PTR HideGroupsHelper(WPARAM wParam,LPARAM lParam) }
INT_PTR UseGroupsHelper(WPARAM wParam,LPARAM lParam)
-{
+{
int newVal = !(GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_USEGROUPS);
db_set_b(NULL,"CList","UseGroups",(BYTE)newVal);
SendMessage(pcli->hwndContactTree,CLM_SETUSEGROUPS,newVal,0);
@@ -205,13 +207,13 @@ static int OnBuildGroupMenu(WPARAM wParam,LPARAM lParam) {
CLISTMENUITEM mi = { sizeof(mi) };
mi.flags = CMIM_FLAGS | ( db_get_b(NULL,"CList","HideOffline",SETTING_HIDEOFFLINE_DEFAULT)?CMIF_CHECKED:0);
- Menu_ModifyItem(hHideOfflineUsersMenuItem, &mi);
+ Menu_ModifyItem(hHideOfflineUsersMenuItem, &mi);
mi.flags = CMIM_FLAGS | (SendMessage(pcli->hwndContactTree,CLM_GETHIDEOFFLINEROOT,0,0)?CMIF_CHECKED:0);
- Menu_ModifyItem(hHideOfflineUsersOutHereMenuItem, &mi);
-
+ Menu_ModifyItem(hHideOfflineUsersOutHereMenuItem, &mi);
+
mi.flags = CMIM_FLAGS | (GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_HIDEEMPTYGROUPS?CMIF_CHECKED:0);
- Menu_ModifyItem(hHideEmptyGroupsMenuItem, &mi);
+ Menu_ModifyItem(hHideEmptyGroupsMenuItem, &mi);
mi.flags = CMIM_FLAGS | (GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_USEGROUPS?0:CMIF_CHECKED);
Menu_ModifyItem(hDisableGroupsMenuItem, &mi);
@@ -221,8 +223,8 @@ static int OnBuildGroupMenu(WPARAM wParam,LPARAM lParam) int static OnIconLibIconChanged(WPARAM wParam,LPARAM lParam)
{
HICON hicon = LoadIconFromExternalFile("clisticons.dll",2,TRUE,FALSE,"NewGroup","Contact List","New Group",-IDI_NEWGROUP,0);
- NewGroupIconidx = ImageList_ReplaceIcon(hCListImages,NewGroupIconidx,hicon);
-
+ NewGroupIconidx = ImageList_ReplaceIcon(hCListImages,NewGroupIconidx,hicon);
+
CLISTMENUITEM mi = { sizeof(mi) };
mi.flags = CMIM_ICON;
mi.hIcon = ImageList_GetIcon(hCListImages,NewGroupIconidx,0);
@@ -234,7 +236,7 @@ int static OnIconLibIconChanged(WPARAM wParam,LPARAM lParam) void InitGroupMenus(void)
{
HICON hicon = LoadIconFromExternalFile("clisticons.dll",2,TRUE,TRUE,"NewGroup","Contact List","New Group",-IDI_NEWGROUP2,0);
- NewGroupIconidx = ImageList_AddIcon(hCListImages,hicon );
+ NewGroupIconidx = ImageList_AddIcon(hCListImages,hicon );
CreateServiceFunction("CLISTMENUSGroup/ExecService",GroupMenuExecService);
CreateServiceFunction("CLISTMENUSGroup/FreeOwnerDataGroupMenu",FreeOwnerDataGroupMenu);
@@ -256,7 +258,7 @@ void InitGroupMenus(void) MO_SetMenuObjectParam(hGroupMenuObject, OPT_USERDEFINEDITEMS, TRUE);
MO_SetMenuObjectParam(hGroupMenuObject, OPT_MENUOBJECT_SET_FREE_SERVICE, "CLISTMENUSGroup/FreeOwnerDataGroupMenu");
MO_SetMenuObjectParam(hGroupMenuObject, OPT_MENUOBJECT_SET_ONADD_SERVICE, "CLISTMENUSGroup/GroupMenuonAddService");
- {
+ {
//add exit command to menu
GroupMenuParam gmp;
@@ -318,7 +320,7 @@ void InitGroupMenus(void) mi.position = 100000;
mi.hIcon = ImageList_GetIcon(hCListImages,NewGroupIconidx,0);
mi.pszService = MS_CLIST_GROUPCREATE;
- mi.pszName = LPGEN("&New Group");
+ mi.pszName = LPGEN("&New Group");
hNewGroupMenuItem = (HGENMENU)AddGroupMenuItem(0,(LPARAM)&mi);
memset(&mi,0,sizeof(mi));
@@ -326,7 +328,7 @@ void InitGroupMenus(void) mi.position = 100001;
mi.hIcon = NULL;
mi.pszService = MS_CLIST_SETHIDEOFFLINE;
- mi.pszName = LPGEN("&Hide Offline Users");
+ mi.pszName = LPGEN("&Hide Offline Users");
gmp.lParam = 0;gmp.wParam = -1;
hHideOfflineUsersMenuItem = (HGENMENU)AddGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);
@@ -335,7 +337,7 @@ void InitGroupMenus(void) mi.position = 100002;
mi.hIcon = NULL;
mi.pszService = "CLISTMENUSGroup/HideOfflineRootHelper";
- mi.pszName = LPGEN("Hide &Offline Users out here");
+ mi.pszName = LPGEN("Hide &Offline Users out here");
hHideOfflineUsersOutHereMenuItem = (HGENMENU)AddGroupMenuItem(0,(LPARAM)&mi);
memset(&mi,0,sizeof(mi));
@@ -343,7 +345,7 @@ void InitGroupMenus(void) mi.position = 100003;
mi.hIcon = NULL;
mi.pszService = "CLISTMENUSGroup/HideGroupsHelper";
- mi.pszName = LPGEN("Hide &Empty Groups");
+ mi.pszName = LPGEN("Hide &Empty Groups");
hHideEmptyGroupsMenuItem = (HGENMENU)AddGroupMenuItem(0,(LPARAM)&mi);
memset(&mi,0,sizeof(mi));
@@ -351,7 +353,7 @@ void InitGroupMenus(void) mi.position = 100004;
mi.hIcon = NULL;
mi.pszService = "CLISTMENUSGroup/UseGroupsHelper";
- mi.pszName = LPGEN("Disable &Groups");
+ mi.pszName = LPGEN("Disable &Groups");
hDisableGroupsMenuItem = (HGENMENU)AddGroupMenuItem(0,(LPARAM)&mi);
HookEvent(ME_SKIN2_ICONSCHANGED,OnIconLibIconChanged);
@@ -396,7 +398,7 @@ static int OnBuildSubGroupMenu(WPARAM wParam,LPARAM lParam) //contact->group
CLISTMENUITEM mi = { sizeof(mi) };
mi.flags = CMIM_FLAGS | (group->hideOffline?CMIF_CHECKED:0);
- Menu_ModifyItem(hHideOfflineUsersHereMenuItem, &mi);
+ Menu_ModifyItem(hHideOfflineUsersHereMenuItem, &mi);
return 0;
}
@@ -412,7 +414,7 @@ static INT_PTR BuildSubGroupMenu(WPARAM wParam,LPARAM lParam) hMenu = CreatePopupMenu();
//hMenu = wParam;
tick = GetTickCount();
-
+
NotifyEventHooks(hPreBuildSubGroupMenuEvent,wParam,0);
CallService(MO_BUILDMENU,(WPARAM)hMenu,(LPARAM)¶m);
@@ -427,11 +429,11 @@ static INT_PTR AddSubGroupMenuItem(WPARAM wParam,LPARAM lParam) CLISTMENUITEM *mi = (CLISTMENUITEM*)lParam;
if ( !pcli->pfnConvertMenu(mi, &tmi))
return 0;
-
+
lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)mir_calloc(sizeof(SubGroupMenuExecParam));
if ( mmep == NULL)
return 0;
-
+
//we need just one parametr.
mmep->szServiceName = mir_strdup(mi->pszService);
mmep->Param1 = mi->popupPosition;
@@ -473,13 +475,13 @@ INT_PTR SubGroupMenuonAddService(WPARAM wParam,LPARAM lParam) INT_PTR SubGroupMenuExecService(WPARAM wParam,LPARAM lParam)
{
if (wParam != 0) {
- lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)wParam;
+ lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)wParam;
if ( !strcmp(mmep->szServiceName,"Help/AboutCommand")) {
//bug in help.c,it used wparam as parent window handle without reason.
mmep->Param1 = 0;
- CallService(mmep->szServiceName,mmep->Param1,lParam);
+ CallService(mmep->szServiceName,mmep->Param1,lParam);
}
- else CallService(mmep->szServiceName,mmep->Param1,mmep->Param2);
+ else CallService(mmep->szServiceName,mmep->Param1,mmep->Param2);
}
return 1;
@@ -516,19 +518,19 @@ void InitSubGroupMenus(void) HookEvent(ME_CLIST_PREBUILDSUBGROUPMENU,OnBuildSubGroupMenu);
//SubGroup menu
- hSubGroupMenuObject = MO_CreateMenuObject("SubGroupMenu", LPGEN("Subgroup menu"), 0, "CLISTMENUSSubGroup/ExecService");
+ hSubGroupMenuObject = MO_CreateMenuObject("SubGroupMenu", LPGEN("Subgroup menu"), 0, "CLISTMENUSSubGroup/ExecService");
MO_SetMenuObjectParam(hSubGroupMenuObject, OPT_USERDEFINEDITEMS, TRUE);
MO_SetMenuObjectParam(hSubGroupMenuObject, OPT_MENUOBJECT_SET_FREE_SERVICE, "CLISTMENUSSubGroup/FreeOwnerDataSubGroupMenu");
MO_SetMenuObjectParam(hSubGroupMenuObject, OPT_MENUOBJECT_SET_ONADD_SERVICE, "CLISTMENUSSubGroup/SubGroupMenuonAddService");
//add exit command to menu
GroupMenuParam gmp;
-
+
CLISTMENUITEM mi = { sizeof(mi) };
mi.position = 1000;
mi.hIcon = ImageList_GetIcon(hCListImages,NewGroupIconidx,0);
mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";
- mi.pszName = LPGEN("&New SubGroup");
+ mi.pszName = LPGEN("&New SubGroup");
gmp.lParam = 0;gmp.wParam = POPUP_NEWSUBGROUP;
hNewSubGroupMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);
@@ -537,7 +539,7 @@ void InitSubGroupMenus(void) mi.position = 1001;
mi.hIcon = NULL;
mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";
- mi.pszName = LPGEN("&Hide Offline Users in here");
+ mi.pszName = LPGEN("&Hide Offline Users in here");
gmp.lParam = 0;gmp.wParam = POPUP_GROUPHIDEOFFLINE;
hHideOfflineUsersHereMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);
@@ -546,16 +548,16 @@ void InitSubGroupMenus(void) mi.position = 900001;
mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_RENAME); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_RENAME));
mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";
- mi.pszName = LPGEN("&Rename Group");
+ mi.pszName = LPGEN("&Rename Group");
gmp.lParam = 0;gmp.wParam = POPUP_RENAMEGROUP;
AddSubGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);
-
+
memset(&mi,0,sizeof(mi));
mi.cbSize = sizeof(mi);
mi.position = 900002;
mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_DELETE); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_DELETE));
mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";
- mi.pszName = LPGEN("&Delete Group");
+ mi.pszName = LPGEN("&Delete Group");
gmp.lParam = 0;gmp.wParam = POPUP_DELETEGROUP;
AddSubGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);
}
diff --git a/plugins/Clist_mw/src/init.cpp b/plugins/Clist_mw/src/init.cpp index 220ed4be88..52581b9f03 100644 --- a/plugins/Clist_mw/src/init.cpp +++ b/plugins/Clist_mw/src/init.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2004 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-04 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_mw/src/keyboard.cpp b/plugins/Clist_mw/src/keyboard.cpp index 140067eff5..58c406056d 100644 --- a/plugins/Clist_mw/src/keyboard.cpp +++ b/plugins/Clist_mw/src/keyboard.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include "commonheaders.h"
#include <m_hotkeys.h>
diff --git a/plugins/Clist_mw/src/stdafx.cpp b/plugins/Clist_mw/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/Clist_mw/src/stdafx.cpp +++ b/plugins/Clist_mw/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Clist_nicer/skineditor/src/commonheaders.h b/plugins/Clist_nicer/skineditor/src/commonheaders.h index 3a7ae2e8d8..f409d6ef2f 100644 --- a/plugins/Clist_nicer/skineditor/src/commonheaders.h +++ b/plugins/Clist_nicer/skineditor/src/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2004 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-04 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/skineditor/src/main.cpp b/plugins/Clist_nicer/skineditor/src/main.cpp index 65a3df340c..bb0038ea2e 100644 --- a/plugins/Clist_nicer/skineditor/src/main.cpp +++ b/plugins/Clist_nicer/skineditor/src/main.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2004 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-04 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -71,7 +72,7 @@ static void ReActiveCombo(HWND hwndDlg) EnableWindow(GetDlgItem(hwndDlg, IDC_CORNER_TL), IsDlgButtonChecked(hwndDlg, IDC_CORNER));
EnableWindow(GetDlgItem(hwndDlg, IDC_CORNER_TR), IsDlgButtonChecked(hwndDlg, IDC_CORNER));
EnableWindow(GetDlgItem(hwndDlg, IDC_CORNER_BR), IsDlgButtonChecked(hwndDlg, IDC_CORNER));
- EnableWindow(GetDlgItem(hwndDlg, IDC_CORNER_BL), IsDlgButtonChecked(hwndDlg, IDC_CORNER));
+ EnableWindow(GetDlgItem(hwndDlg, IDC_CORNER_BL), IsDlgButtonChecked(hwndDlg, IDC_CORNER));
ChangeControlItems(hwndDlg, !IsDlgButtonChecked(hwndDlg, IDC_IGNORE), IDC_IGNORE);
} else {
ChangeControlItems(hwndDlg, !IsDlgButtonChecked(hwndDlg, IDC_IGNORE), IDC_IGNORE);
@@ -326,7 +327,7 @@ static void SetChangedStatusItemFlag(WPARAM wParam, HWND hwndDlg) ChangedSItems.bCORNER = TRUE; break;
case IDC_BASECOLOUR:
- ChangedSItems.bCOLOR = TRUE; break;
+ ChangedSItems.bCOLOR = TRUE; break;
case IDC_BASECOLOUR2:
ChangedSItems.bCOLOR2 = TRUE; break;
case IDC_COLOR2_TRANSPARENT:
@@ -429,13 +430,13 @@ static void UpdateStatusStructSettingsFromOptDlg(HWND hwndDlg, int index) }
if (ChangedSItems.bMARGIN_LEFT) {
- GetWindowTextA(GetDlgItem(hwndDlg, IDC_MRGN_LEFT), buf, 10);
+ GetWindowTextA(GetDlgItem(hwndDlg, IDC_MRGN_LEFT), buf, 10);
if (buf[0] != 0)
p->MARGIN_LEFT = (BYTE) SendDlgItemMessage(hwndDlg, IDC_MRGN_LEFT_SPIN, UDM_GETPOS, 0, 0);
}
if (ChangedSItems.bMARGIN_TOP) {
- GetWindowTextA(GetDlgItem(hwndDlg, IDC_MRGN_TOP), buf, 10);
+ GetWindowTextA(GetDlgItem(hwndDlg, IDC_MRGN_TOP), buf, 10);
if (buf[0] != 0)
p->MARGIN_TOP = (BYTE) SendDlgItemMessage(hwndDlg, IDC_MRGN_TOP_SPIN, UDM_GETPOS, 0, 0);
}
@@ -447,7 +448,7 @@ static void UpdateStatusStructSettingsFromOptDlg(HWND hwndDlg, int index) }
if (ChangedSItems.bMARGIN_BOTTOM) {
- GetWindowTextA(GetDlgItem(hwndDlg, IDC_MRGN_BOTTOM), buf, 10);
+ GetWindowTextA(GetDlgItem(hwndDlg, IDC_MRGN_BOTTOM), buf, 10);
if (buf[0] != 0)
p->MARGIN_BOTTOM = (BYTE) SendDlgItemMessage(hwndDlg, IDC_MRGN_BOTTOM_SPIN, UDM_GETPOS, 0, 0);
}
@@ -575,7 +576,7 @@ static void OnListItemsChange(HWND hwndDlg) itemData = SendDlgItemMessage(hwndDlg, IDC_ITEMS, LB_GETITEMDATA, last_indizes[n], 0);
if (itemData == ID_EXTBKSEPARATOR)
continue;
-
+
StatusItems_t *p = StatusItems[itemData - ID_EXTBK_FIRST];
if (p->ALPHA != pFirst->ALPHA)
DialogSettingForMultiSel.ALPHA = -1;
@@ -799,7 +800,7 @@ static INT_PTR CALLBACK SkinEdit_ExtBkDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa OnListItemsChange(hwndDlg);
if (psd->pfnClcOptionsChanged)
psd->pfnClcOptionsChanged();
- break;
+ break;
case IDC_GRADIENT:
ReActiveCombo(hwndDlg);
break;
@@ -854,8 +855,8 @@ static INT_PTR CALLBACK SkinEdit_ExtBkDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa return FALSE;
}
-/*
- * unimplemented
+/*
+ * unimplemented
*/
static BOOL CALLBACK SkinEdit_ImageItemEditProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
@@ -870,8 +871,8 @@ static INT_PTR SkinEdit_FillByCurrentSel(WPARAM wParam, LPARAM lParam) return 0;
}
-/*
- * service function
+/*
+ * service function
* creates additional tab pages under the given parent window handle
* expects a SKINDESCRIPTON * in lParam
*/
diff --git a/plugins/Clist_nicer/skineditor/src/stdafx.cpp b/plugins/Clist_nicer/skineditor/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/Clist_nicer/skineditor/src/stdafx.cpp +++ b/plugins/Clist_nicer/skineditor/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp index 0907646b2b..521dcb6e80 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -1677,7 +1679,7 @@ int FrameNCPaint(HWND hwnd, WNDPROC oldWndProc, WPARAM wParam, LPARAM lParam, BO ReleaseDC(hwnd, hdc);
return 0;
}
-
+
if ( GetWindowLongPtr(hwnd, GWL_STYLE) & WS_BORDER) {
hdc = GetWindowDC(hwnd);
HPEN hPenOld = reinterpret_cast<HPEN>(SelectObject(hdc, g_hPenCLUIFrames));
@@ -2628,7 +2630,7 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA DestroyMenu(hmenu);
}
break;
-
+
case WM_LBUTTONDBLCLK:
Framemod = -1;
lbypos = -1;
@@ -2977,7 +2979,7 @@ int CLUIFrameResizeFloatingFrame(int framepos) if (Frames[framepos].TitleBar.ShowTitleBar)
RedrawWindow(Frames[framepos].TitleBar.hwnd, NULL, NULL, RDW_INVALIDATE | RDW_FRAME | RDW_UPDATENOW);
-
+
RedrawWindow(Frames[framepos].hWnd, NULL, NULL, RDW_INVALIDATE | RDW_FRAME | RDW_UPDATENOW);
return 0;
}
diff --git a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp index 4e92b97a23..e7d6a0f438 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include <commonheaders.h>
//////////////////////////////Group MENU/////////////////////////
diff --git a/plugins/Clist_nicer/src/Docking.cpp b/plugins/Clist_nicer/src/Docking.cpp index 68bb5a2193..c96e13b1e0 100644 --- a/plugins/Clist_nicer/src/Docking.cpp +++ b/plugins/Clist_nicer/src/Docking.cpp @@ -1,8 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -18,10 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-UNICODE - done.
-
*/
+
#include "commonheaders.h"
#define WM_DOCKCALLBACK (WM_USER+121)
@@ -151,7 +151,7 @@ int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) if ((ptCursor.x < rcMonitor.left + EDGESENSITIVITY) || (ptCursor.x >= rcMonitor.right - EDGESENSITIVITY)) {
if ( !(GetWindowLongPtr(msg->hwnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) {
SendMessage(msg->hwnd, CLUIINTM_REDRAW, 0, 0);
- MessageBox(0, TranslateT("The contact list cannot be docked when using the default title bar and border. Use a toolwindow or borderless style instead."),
+ MessageBox(0, TranslateT("The contact list cannot be docked when using the default title bar and border. Use a toolwindow or borderless style instead."),
TranslateT("Contact list docking"), MB_OK);
return 0;
}
diff --git a/plugins/Clist_nicer/src/Include/alphablend.h b/plugins/Clist_nicer/src/Include/alphablend.h index de0e7c4fa8..569a77ce6c 100644 --- a/plugins/Clist_nicer/src/Include/alphablend.h +++ b/plugins/Clist_nicer/src/Include/alphablend.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -21,10 +22,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-void __inline gradientVertical(UCHAR *ubRedFinal, UCHAR *ubGreenFinal, UCHAR *ubBlueFinal,
- ULONG ulBitmapHeight, UCHAR ubRed, UCHAR ubGreen, UCHAR ubBlue, UCHAR ubRed2,
+void __inline gradientVertical(UCHAR *ubRedFinal, UCHAR *ubGreenFinal, UCHAR *ubBlueFinal,
+ ULONG ulBitmapHeight, UCHAR ubRed, UCHAR ubGreen, UCHAR ubBlue, UCHAR ubRed2,
UCHAR ubGreen2, UCHAR ubBlue2, DWORD FLG_GRADIENT, BOOL transparent, UINT32 y, UCHAR *ubAlpha);
-void __inline gradientHorizontal( UCHAR *ubRedFinal, UCHAR *ubGreenFinal, UCHAR *ubBlueFinal,
- ULONG ulBitmapWidth, UCHAR ubRed, UCHAR ubGreen, UCHAR ubBlue, UCHAR ubRed2,
+void __inline gradientHorizontal( UCHAR *ubRedFinal, UCHAR *ubGreenFinal, UCHAR *ubBlueFinal,
+ ULONG ulBitmapWidth, UCHAR ubRed, UCHAR ubGreen, UCHAR ubBlue, UCHAR ubRed2,
UCHAR ubGreen2, UCHAR ubBlue2, DWORD FLG_GRADIENT, BOOL transparent, UINT32 x, UCHAR *ubAlpha);
\ No newline at end of file diff --git a/plugins/Clist_nicer/src/Include/clc.h b/plugins/Clist_nicer/src/Include/clc.h index 9fe24eb181..b53e466079 100644 --- a/plugins/Clist_nicer/src/Include/clc.h +++ b/plugins/Clist_nicer/src/Include/clc.h @@ -1,34 +1,26 @@ /*
- * astyle --force-indent=tab=4 --brackets=linux --indent-switches
- * --pad=oper --one-line=keep-blocks --unpad=paren
- *
- * Miranda IM: the free IM client for Microsoft* Windows*
- *
- * Copyright 2000-2010 Miranda ICQ/IM project,
- * all portions of this codebase are copyrighted to the people
- * listed in contributors.txt.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * you should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * part of clist_nicer plugin for Miranda.
- *
- * (C) 2005-2010 by silvercircle _at_ gmail _dot_ com and contributors
- *
- * $Id: clc.h 13850 2011-09-10 03:26:59Z borkra $
- *
- */
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
#define INTM_XSTATUSCHANGED (WM_USER+26)
#define INTM_METACHANGEDEVENT (WM_USER+27)
diff --git a/plugins/Clist_nicer/src/Include/clist.h b/plugins/Clist_nicer/src/Include/clist.h index 1969039350..b60b0db108 100644 --- a/plugins/Clist_nicer/src/Include/clist.h +++ b/plugins/Clist_nicer/src/Include/clist.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
void LoadContactTree(void);
int IconFromStatusMode(const char *szProto, int status, HANDLE hContact, HICON *phIcon);
HTREEITEM GetTreeItemByHContact(HANDLE hContact);
diff --git a/plugins/Clist_nicer/src/Include/commonheaders.h b/plugins/Clist_nicer/src/Include/commonheaders.h index accb1f265b..3f052417b3 100644 --- a/plugins/Clist_nicer/src/Include/commonheaders.h +++ b/plugins/Clist_nicer/src/Include/commonheaders.h @@ -1,31 +1,26 @@ /*
- * Miranda IM: the free IM client for Microsoft* Windows*
- *
- * Copyright 2000-2010 Miranda ICQ/IM project,
- * all portions of this codebase are copyrighted to the people
- * listed in contributors.txt.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * you should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * part of clist_nicer plugin for Miranda.
- *
- * (C) 2005-2010 by silvercircle _at_ gmail _dot_ com and contributors
- *
- * $Id: commonheaders.h 14157 2012-03-10 18:53:26Z george.hazan $
- *
- */
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
#define _WIN32_WINNT 0x0501
#define _WIN32_IE 0x0501
diff --git a/plugins/Clist_nicer/src/Include/config.h b/plugins/Clist_nicer/src/Include/config.h index 40412b6bf6..2052232339 100644 --- a/plugins/Clist_nicer/src/Include/config.h +++ b/plugins/Clist_nicer/src/Include/config.h @@ -1,31 +1,26 @@ /*
- * Miranda IM: the free IM client for Microsoft* Windows*
- *
- * Copyright 2000-2010 Miranda ICQ/IM project,
- * all portions of this codebase are copyrighted to the people
- * listed in contributors.txt.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * you should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * part of clist_nicer plugin for Miranda.
- *
- * (C) 2005-2010 by silvercircle _at_ gmail _dot_ com and contributors
- *
- * $Id: config.h 12709 2010-09-16 12:06:06Z borkra $
- *
- */
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
#include <stdexcept>
@@ -83,13 +78,13 @@ public: static INT_PTR writeTString(const HANDLE hContact, const char *szModule, const char *szSetting, const TCHAR *st);
static INT_PTR writeString(const HANDLE hContact, const char *szModule, const char *szSetting, const char *st);
-
+
static TExtraCache* getCache(const HANDLE hContact, const char *szProto);
public:
static TCluiData dat;
static ClcData* clcdat;
-
+
static LIST<TExtraCache> arCache;
static bool shutDown;
diff --git a/plugins/Clist_nicer/src/Include/extBackg.h b/plugins/Clist_nicer/src/Include/extBackg.h index 53450dcc0b..8cca462556 100644 --- a/plugins/Clist_nicer/src/Include/extBackg.h +++ b/plugins/Clist_nicer/src/Include/extBackg.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -94,4 +95,3 @@ void ReActiveCombo(HWND hwndDlg); //BOOL __fastcall GetItemByStatus(int status, StatusItems_t *retitem);
void FillOptionDialogByStatusItem(HWND hwndDlg, StatusItems_t *item);
-
diff --git a/plugins/Clist_nicer/src/alphablend.cpp b/plugins/Clist_nicer/src/alphablend.cpp index 23cf9d76a2..3be597cf6c 100644 --- a/plugins/Clist_nicer/src/alphablend.cpp +++ b/plugins/Clist_nicer/src/alphablend.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -49,7 +50,7 @@ void __forceinline DrawBorderStyle(HDC hdcwnd, RECT *rc, DWORD BORDERSTYLE) {
HPEN hPenOld = 0;
POINT pt;
-
+
switch(BORDERSTYLE) {
case BDR_RAISEDOUTER: // raised
MoveToEx(hdcwnd, rc->left, rc->bottom - 1, &pt);
@@ -94,16 +95,16 @@ void DrawAlpha(HDC hdcwnd, PRECT rc, DWORD basecolor, int alpha, DWORD basecolor UCHAR ubRedFinal = 0xFF;
UCHAR ubGreenFinal = 0xFF;
UCHAR ubBlueFinal = 0xFF;
- UCHAR ubRed;
+ UCHAR ubRed;
UCHAR ubGreen;
UCHAR ubBlue;
- UCHAR ubRed2;
+ UCHAR ubRed2;
UCHAR ubGreen2;
UCHAR ubBlue2;
- int realx;
+ int realx;
- FLOAT fAlphaFactor;
+ FLOAT fAlphaFactor;
LONG realHeight = (rc->bottom - rc->top);
LONG realWidth = (rc->right - rc->left);
LONG realHeightHalf = realHeight >> 1;
@@ -289,7 +290,7 @@ void DrawAlpha(HDC hdcwnd, PRECT rc, DWORD basecolor, int alpha, DWORD basecolor saved_alpha = (UCHAR) (basecolor >> 24);
// corners
- BrMask = CreateSolidBrush(RGB(0xFF, 0x00, 0xFF));
+ BrMask = CreateSolidBrush(RGB(0xFF, 0x00, 0xFF));
{
bmi.bmiHeader.biWidth = ulBitmapWidth = realHeightHalf;
bmi.bmiHeader.biHeight = ulBitmapHeight = realHeight;
@@ -309,7 +310,7 @@ void DrawAlpha(HDC hdcwnd, PRECT rc, DWORD basecolor, int alpha, DWORD basecolor DeleteDC(hdc);
return;
}
-
+
holdbrush = reinterpret_cast<HBRUSH>(SelectObject(hdc, BrMask));
holdbitmap = reinterpret_cast<HBITMAP>(SelectObject(hdc, hbitmap));
RoundRect(hdc, -1, -1, ulBitmapWidth * 2 + 1, (realHeight + 1), cfg::dat.cornerRadius << 1, cfg::dat.cornerRadius << 1);
@@ -336,7 +337,7 @@ void DrawAlpha(HDC hdcwnd, PRECT rc, DWORD basecolor, int alpha, DWORD basecolor }
}
}
- }
+ }
GdiAlphaBlend(hdcwnd, rc->left, rc->top, ulBitmapWidth, ulBitmapHeight, hdc, 0, 0, ulBitmapWidth, ulBitmapHeight, bf);
SelectObject(hdc, holdbitmap);
DeleteObject(hbitmap);
@@ -372,9 +373,9 @@ void DrawAlpha(HDC hdcwnd, PRECT rc, DWORD basecolor, int alpha, DWORD basecolor }
}
}
- }
+ }
GdiAlphaBlend(hdcwnd, rc->right - realHeightHalf, rc->top, ulBitmapWidth, ulBitmapHeight, hdc, 0, 0, ulBitmapWidth, ulBitmapHeight, bf);
- }
+ }
DrawBorderStyle(hdcwnd, rc, BORDERSTYLE);
SelectObject(hdc, holdbitmap);
@@ -395,10 +396,10 @@ void __inline gradientHorizontal(UCHAR *ubRedFinal, UCHAR *ubGreenFinal, UCHAR * *ubRedFinal = ubRed; *ubGreenFinal = ubGreen; *ubBlueFinal = ubBlue;
} else { // solid to solid2
if (FLG_GRADIENT & GRADIENT_LR) {
- fSolidMulti = ((float) x / (float) ulBitmapWidth);
+ fSolidMulti = ((float) x / (float) ulBitmapWidth);
fInvSolidMulti = 1 - fSolidMulti;
} else {
- fInvSolidMulti = ((float) x / (float) ulBitmapWidth);
+ fInvSolidMulti = ((float) x / (float) ulBitmapWidth);
fSolidMulti = 1 - fInvSolidMulti;
}
@@ -416,17 +417,17 @@ void __inline gradientVertical(UCHAR *ubRedFinal, UCHAR *ubGreenFinal, UCHAR *ub // solid to transparent
if (transparent) {
- *ubAlpha = (UCHAR) ((float) y / (float) ulBitmapHeight * 255);
+ *ubAlpha = (UCHAR) ((float) y / (float) ulBitmapHeight * 255);
*ubAlpha = FLG_GRADIENT & GRADIENT_BT ? 0xFF - *ubAlpha : *ubAlpha;
*ubRedFinal = ubRed; *ubGreenFinal = ubGreen; *ubBlueFinal = ubBlue;
} else { // solid to solid2
if (FLG_GRADIENT & GRADIENT_BT) {
- fSolidMulti = ((float) y / (float) ulBitmapHeight);
+ fSolidMulti = ((float) y / (float) ulBitmapHeight);
fInvSolidMulti = 1 - fSolidMulti;
} else {
- fInvSolidMulti = ((float) y / (float) ulBitmapHeight);
+ fInvSolidMulti = ((float) y / (float) ulBitmapHeight);
fSolidMulti = 1 - fInvSolidMulti;
- }
+ }
*ubRedFinal = (UCHAR) (((float) ubRed * (float) fInvSolidMulti) + ((float) ubRed2 * (float) fSolidMulti));
*ubGreenFinal = (UCHAR) (((float) ubGreen * (float) fInvSolidMulti) + ((float) ubGreen2 * (float) fSolidMulti));
diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp index 42ac37f5fd..f3a5455dc6 100644 --- a/plugins/Clist_nicer/src/clc.cpp +++ b/plugins/Clist_nicer/src/clc.cpp @@ -1,34 +1,26 @@ /*
- * astyle --force-indent=tab=4 --brackets=linux --indent-switches
- * --pad=oper --one-line=keep-blocks --unpad=paren
- *
- * Miranda IM: the free IM client for Microsoft* Windows*
- *
- * Copyright 2000-2010 Miranda ICQ/IM project,
- * all portions of this codebase are copyrighted to the people
- * listed in contributors.txt.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * you should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * part of clist_nicer plugin for Miranda.
- *
- * (C) 2005-2010 by silvercircle _at_ gmail _dot_ com and contributors
- *
- * $Id: clc.cpp 12968 2010-10-16 20:10:55Z Michael.Kunz@s2005.TU-Chemnitz.de $
- *
- */
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
#include <commonheaders.h>
#include <resource.h>
diff --git a/plugins/Clist_nicer/src/clcidents.cpp b/plugins/Clist_nicer/src/clcidents.cpp index 319dff6893..3b6f294188 100644 --- a/plugins/Clist_nicer/src/clcidents.cpp +++ b/plugins/Clist_nicer/src/clcidents.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include <commonheaders.h>
/* the CLC uses 3 different ways to identify elements in its list, this file
@@ -69,7 +71,7 @@ int FindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, ClcContact **contact, *isVisible = 0;
else {
int posy = RowHeight::getItemTopY(dat,index+1);
- if (posy<dat->yScroll)
+ if (posy<dat->yScroll)
*isVisible=0;
//if ((index + 1) * dat->rowHeight< dat->yScroll)
// *isVisible = 0;
diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp index 4db62ce3a9..58ae1e9948 100644 --- a/plugins/Clist_nicer/src/clcitems.cpp +++ b/plugins/Clist_nicer/src/clcitems.cpp @@ -1,34 +1,26 @@ /*
- * astyle --force-indent=tab=4 --brackets=linux --indent-switches
- * --pad=oper --one-line=keep-blocks --unpad=paren
- *
- * Miranda IM: the free IM client for Microsoft* Windows*
- *
- * Copyright 2000-2010 Miranda ICQ/IM project,
- * all portions of this codebase are copyrighted to the people
- * listed in contributors.txt.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * you should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * part of clist_nicer plugin for Miranda.
- *
- * (C) 2005-2010 by silvercircle _at_ gmail _dot_ com and contributors
- *
- * $Id: clcitems.cpp 12968 2010-10-16 20:10:55Z Michael.Kunz@s2005.TU-Chemnitz.de $
- *
- */
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
#include <commonheaders.h>
@@ -362,7 +354,7 @@ void RTL_DetectAndSet(ClcContact *contact, HANDLE hContact) TCHAR *szText = NULL;
DWORD iLen;
TExtraCache *p;
-
+
ZeroMemory(infoTypeC2, sizeof(WORD) * 12);
if (contact == NULL) {
diff --git a/plugins/Clist_nicer/src/clcmsgs.cpp b/plugins/Clist_nicer/src/clcmsgs.cpp index 2f9f4bb177..da02231308 100644 --- a/plugins/Clist_nicer/src/clcmsgs.cpp +++ b/plugins/Clist_nicer/src/clcmsgs.cpp @@ -1,34 +1,26 @@ /*
- * astyle --force-indent=tab=4 --brackets=linux --indent-switches
- * --pad=oper --one-line=keep-blocks --unpad=paren
- *
- * Miranda IM: the free IM client for Microsoft* Windows*
- *
- * Copyright 2000-2010 Miranda ICQ/IM project,
- * all portions of this codebase are copyrighted to the people
- * listed in contributors.txt.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * you should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * part of clist_nicer plugin for Miranda.
- *
- * (C) 2005-2010 by silvercircle _at_ gmail _dot_ com and contributors
- *
- * $Id: clcmsgs.cpp 12535 2010-08-29 23:48:32Z silvercircle $
- *
- */
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
#include <commonheaders.h>
@@ -97,7 +89,7 @@ LRESULT ProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPARAM return 0;
case CLM_SETFONT:
- if (HIWORD(lParam)<0 || HIWORD(lParam)>FONTID_LAST)
+ if (HIWORD(lParam)<0 || HIWORD(lParam)>FONTID_LAST)
return 0;
dat->fontInfo[HIWORD(lParam)].hFont = (HFONT)wParam;
dat->fontInfo[HIWORD(lParam)].changed = 1;
diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp index f4d058f234..cc9fc0dc3b 100644 --- a/plugins/Clist_nicer/src/clcopts.cpp +++ b/plugins/Clist_nicer/src/clcopts.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -19,10 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-UNICODE done
-
*/
+
#include <commonheaders.h>
#include "../coolsb/coolscroll.h"
@@ -221,7 +220,7 @@ static INT_PTR CALLBACK DlgProcDspGroups(HWND hwndDlg, UINT msg, WPARAM wParam, LRESULT curSel = SendDlgItemMessage(hwndDlg, IDC_GROUPALIGN, CB_GETCURSEL, 0, 0);
if (curSel != CB_ERR) {
- cfg::dat.bGroupAlign = (BYTE)curSel;
+ cfg::dat.bGroupAlign = (BYTE)curSel;
cfg::writeByte("CLC", "GroupAlign", cfg::dat.bGroupAlign);
}
@@ -459,10 +458,10 @@ static INT_PTR CALLBACK DlgProcDspAdvanced(HWND hwndDlg, UINT msg, WPARAM wParam cfg::dat.bNoOfflineAvatars = IsDlgButtonChecked(hwndDlg, IDC_NOAVATARSOFFLINE) ? TRUE : FALSE;
cfg::writeByte("CList", "NoOfflineAV", (BYTE)cfg::dat.bNoOfflineAvatars);
-
+
cfg::dat.bShowLocalTime = IsDlgButtonChecked(hwndDlg, IDC_SHOWLOCALTIME) ? 1 : 0;
cfg::writeByte("CLC", "ShowLocalTime", (BYTE)cfg::dat.bShowLocalTime);
-
+
cfg::dat.bShowLocalTimeSelective = IsDlgButtonChecked(hwndDlg, IDC_SHOWLOCALTIMEONLYWHENDIFFERENT) ? 1 : 0;
cfg::writeByte("CLC", "SelectiveLocalTime", (BYTE)cfg::dat.bShowLocalTimeSelective);
@@ -680,14 +679,14 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam exStyle |= checkBoxToStyleEx[i].flag;
}
cfg::writeDword("CLC", "ExStyle", exStyle);
-
+
DWORD fullGreyoutFlags = MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS));
cfg::writeDword("CLC", "FullGreyoutFlags", fullGreyoutFlags);
if (IsDlgButtonChecked(hwndDlg, IDC_GREYOUT))
cfg::writeDword("CLC", "GreyoutFlags", fullGreyoutFlags);
else
cfg::writeDword("CLC", "GreyoutFlags", 0);
-
+
cfgSetFlag(hwndDlg, IDC_FULLROWSELECT, CLUI_FULLROWSELECT);
cfg::writeWord("CLC", "ScrollTime", (WORD) SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0));
diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp index 64935ee526..bdef00c0ec 100644 --- a/plugins/Clist_nicer/src/clcpaint.cpp +++ b/plugins/Clist_nicer/src/clcpaint.cpp @@ -1,30 +1,25 @@ /*
-* Miranda IM: the free IM client for Microsoft* Windows*
-*
-* Copyright 2000-2010 Miranda ICQ/IM project,
-* all portions of this codebase are copyrighted to the people
-* listed in contributors.txt.
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* you should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*
-* part of clist_nicer plugin for Miranda.
-*
-* (C) 2005-2010 by silvercircle _at_ gmail _dot_ com and contributors
-*
-* $Id: clcpaint.cpp 12909 2010-10-06 14:53:00Z silvercircle $
-*
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "commonheaders.h"
@@ -1327,13 +1322,13 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint) DeleteDC(hdcAV);
return;
}
-
+
int y = -dat->yScroll;
HDC hdcMem = CreateCompatibleDC(hdc);
HBITMAP hBmpOsb = CreateBitmap(clRect.right, clRect.bottom, 1, GetDeviceCaps(hdc, BITSPIXEL), NULL);
HBITMAP hOldBitmap = reinterpret_cast<HBITMAP>(SelectObject(hdcMem, hBmpOsb));
-
+
TEXTMETRIC tm;
HFONT hOldFont = reinterpret_cast<HFONT>(SelectObject(hdcMem, dat->fontInfo[FONTID_GROUPS].hFont));
GetTextMetrics(hdcMem, &tm);
@@ -1341,7 +1336,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint) SelectObject(hdcMem, dat->fontInfo[FONTID_GROUPCOUNTS].hFont);
GetTextMetrics(hdcMem, &tm);
groupCountsFontTopShift -= tm.tmAscent;
-
+
int fontHeight;
ChangeToFont(hdcMem, dat, FONTID_CONTACTS, &fontHeight);
@@ -1425,7 +1420,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint) }
DeleteDC(hdcBmp);
}
-
+
bgdone:
ClcGroup *group = &dat->list;
group->scanIndex = 0;
diff --git a/plugins/Clist_nicer/src/clcutils.cpp b/plugins/Clist_nicer/src/clcutils.cpp index 644aa65cdd..f947d94c52 100644 --- a/plugins/Clist_nicer/src/clcutils.cpp +++ b/plugins/Clist_nicer/src/clcutils.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -19,10 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-UNICODE done
-
*/
+
#include <commonheaders.h>
#include "../coolsb/coolscroll.h"
diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp index 6d4150a3d7..0d1e5845de 100644 --- a/plugins/Clist_nicer/src/clistevents.cpp +++ b/plugins/Clist_nicer/src/clistevents.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -20,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include <commonheaders.h>
#include "../cluiframes/cluiframes.h"
@@ -118,10 +120,10 @@ LRESULT CALLBACK EventAreaWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break;
}
case WM_NCCALCSIZE:
- return FrameNCCalcSize(hwnd, DefWindowProc, wParam, lParam,
+ return FrameNCCalcSize(hwnd, DefWindowProc, wParam, lParam,
wndFrameEventArea ? wndFrameEventArea->TitleBar.ShowTitleBar : 0);
case WM_NCPAINT:
- return FrameNCPaint(hwnd, DefWindowProc, wParam, lParam,
+ return FrameNCPaint(hwnd, DefWindowProc, wParam, lParam,
wndFrameEventArea ? wndFrameEventArea->TitleBar.ShowTitleBar : 0);
case WM_DRAWITEM:
{
@@ -212,7 +214,7 @@ LRESULT CALLBACK EventAreaWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa if (cfg::dat.bWallpaperMode)
SkinDrawBg(hwnd, hdcMem);
-
+
StatusItems_t *item = arStatusItems[ID_EXTBKEVTAREA - ID_STATUS_OFFLINE];
if (item->IGNORED)
FillRect(hdcMem, &rc, GetSysColorBrush(COLOR_3DFACE));
diff --git a/plugins/Clist_nicer/src/clistmenus.cpp b/plugins/Clist_nicer/src/clistmenus.cpp index 71cabdb098..ff5e1df8e6 100644 --- a/plugins/Clist_nicer/src/clistmenus.cpp +++ b/plugins/Clist_nicer/src/clistmenus.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -60,7 +61,7 @@ INT_PTR CloseAction(WPARAM wParam,LPARAM lParam) static HANDLE hWindowListIGN = 0;
-/*
+/*
* dialog procedure for handling the contact ignore dialog (available from the contact
* menu
*/
@@ -108,11 +109,11 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("When needed by status message"));
if (cfg::clcdat) {
- FindItem(pcli->hwndContactTree, cfg::clcdat, hContact, &contact, NULL, NULL);
+ FindItem(pcli->hwndContactTree, cfg::clcdat, hContact, &contact, NULL, NULL);
if (contact && contact->type != CLCIT_CONTACT) {
DestroyWindow(hWnd);
return FALSE;
- }
+ }
else {
TCHAR szTitle[512];
DWORD dwFlags = cfg::getDword(hContact, "CList", "CLN_Flags", 0);
@@ -220,7 +221,7 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA LRESULT checked = 0;
int i = 0;
- FindItem(pcli->hwndContactTree, cfg::clcdat, hContact, &contact, NULL, NULL);
+ FindItem(pcli->hwndContactTree, cfg::clcdat, hContact, &contact, NULL, NULL);
if (iSel != CB_ERR) {
dwFlags &= ~(ECF_FORCEAVATAR | ECF_HIDEAVATAR);
@@ -347,13 +348,13 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA return FALSE;
}
-/*
+/*
* service function: Open ignore settings dialog for the contact handle in wParam
* (clist_nicer+ specific service)
- *
+ *
* Servicename = CList/SetContactIgnore
*
- * ensure that dialog is only opened once (the dialog proc saves the window handle of an open dialog
+ * ensure that dialog is only opened once (the dialog proc saves the window handle of an open dialog
* of this type to the contacts database record).
*
* if dialog is already open, focus it.
@@ -376,10 +377,10 @@ static INT_PTR SetContactIgnore(WPARAM wParam, LPARAM lParam) return 0;
}
-/*
+/*
* service function: Set a contacts floating status.
* (clist_nicer+ specific service)
- *
+ *
* Servicename = CList/SetContactFloating
*
* a floating contact appears as a small independent top level window anywhere on
diff --git a/plugins/Clist_nicer/src/clistmod.cpp b/plugins/Clist_nicer/src/clistmod.cpp index 3eda89c7a4..d8e97bcd7f 100644 --- a/plugins/Clist_nicer/src/clistmod.cpp +++ b/plugins/Clist_nicer/src/clistmod.cpp @@ -1,34 +1,26 @@ /*
- * astyle --force-indent=tab=4 --brackets=linux --indent-switches
- * --pad=oper --one-line=keep-blocks --unpad=paren
- *
- * Miranda IM: the free IM client for Microsoft* Windows*
- *
- * Copyright 2000-2010 Miranda ICQ/IM project,
- * all portions of this codebase are copyrighted to the people
- * listed in contributors.txt.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * you should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * part of clist_nicer plugin for Miranda.
- *
- * (C) 2005-2010 by silvercircle _at_ gmail _dot_ com and contributors
- *
- * $Id: clistmod.cpp 12978 2010-10-17 06:50:51Z silvercircle $
- *
- */
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-10 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
#include <commonheaders.h>
diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp index 666b9b2ab8..3dac5426da 100644 --- a/plugins/Clist_nicer/src/clistopts.cpp +++ b/plugins/Clist_nicer/src/clistopts.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -19,10 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-UNICODE done
-
*/
+
#include "commonheaders.h"
void LoadContactTree(void);
@@ -50,7 +49,7 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP case WM_DESTROY:
UnhookEvent((HANDLE)GetWindowLongPtr(hwndDlg, GWLP_USERDATA));
break;
-
+
case WM_INITDIALOG:
opt_gen_opts_changed = 0;
TranslateDialogDefault(hwndDlg);
@@ -113,7 +112,7 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP for (i = 0; i < count; i++) {
if ( !IsAccountEnabled(accs[i]) || CallProtoService(accs[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0) == 0)
continue;
-
+
item = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM) accs[i]->tszAccountName);
SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETITEMDATA, item, (LPARAM)accs[i] );
if (dbv.type == DBVT_ASCIIZ && !lstrcmpA(dbv.pszVal, accs[i]->szModuleName ))
diff --git a/plugins/Clist_nicer/src/clistsettings.cpp b/plugins/Clist_nicer/src/clistsettings.cpp index 9f380bc219..81506fa750 100644 --- a/plugins/Clist_nicer/src/clistsettings.cpp +++ b/plugins/Clist_nicer/src/clistsettings.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -19,10 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-UNICODE done
-
*/
+
#include "commonheaders.h"
INT_PTR GetContactStatusMessage(WPARAM wParam, LPARAM lParam)
diff --git a/plugins/Clist_nicer/src/clisttray.cpp b/plugins/Clist_nicer/src/clisttray.cpp index a11daa1ad0..ac955750cd 100644 --- a/plugins/Clist_nicer/src/clisttray.cpp +++ b/plugins/Clist_nicer/src/clisttray.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -19,10 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-UNICODE done
-
*/
+
#include "commonheaders.h"
#define TRAYICON_ID_BASE 100
diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index 37d156be0d..afe7abbc24 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -1,31 +1,26 @@ /*
- * Miranda IM: the free IM client for Microsoft* Windows*
- *
- * Copyright 2000-2010 Miranda ICQ/IM project,
- * all portions of this codebase are copyrighted to the people
- * listed in contributors.txt.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * you should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * part of clist_nicer plugin for Miranda.
- *
- * (C) 2005-2010 by silvercircle _at_ gmail _dot_ com and contributors
- *
- * $Id: clui.cpp 13813 2011-08-31 21:49:46Z borkra $
- *
- */
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
#include <commonheaders.h>
#include <m_findadd.h>
@@ -1727,7 +1722,7 @@ buttons_done: else if (pd->protopos == nParts - 1)
x -= (cfg::dat.bCRight / 2);
}
-
+
if (showOpts & 2) {
TCHAR szName[64];
PROTOACCOUNT* pa = ProtoGetAccount( szProto );
@@ -1976,7 +1971,7 @@ void LoadCLUIModule(void) if ( cfg::getByte("CLUI", "FloaterMode", 0)) {
MessageBox(NULL,
- TranslateT("You need the FloatingContacts plugin, cause the embedded floating contacts were removed"),
+ TranslateT("You need the FloatingContacts plugin, cause the embedded floating contacts were removed"),
TranslateT("Warning"), MB_OK | MB_ICONWARNING);
db_unset(NULL, "CLUI", "FloaterMode");
}
diff --git a/plugins/Clist_nicer/src/cluiopts.cpp b/plugins/Clist_nicer/src/cluiopts.cpp index b49b5e36e2..d257b7b0cc 100644 --- a/plugins/Clist_nicer/src/cluiopts.cpp +++ b/plugins/Clist_nicer/src/cluiopts.cpp @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -18,10 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-UNICODE done
-
*/
+
#include "commonheaders.h"
extern HANDLE hExtraImageApplying;
@@ -29,7 +29,7 @@ extern SIZE g_oldSize; extern POINT g_oldPos;
extern COLORREF g_CLUISkinnedBkColorRGB;
extern HPEN g_hPenCLUIFrames;
-
+
static int opt_clui_changed = 0;
void AddToTaskBar(HWND hWnd);
@@ -142,7 +142,7 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l Utils::enableDlgControl(hwndDlg, IDC_AUTOSIZEUPWARD, IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE));
}
if ((LOWORD(wParam) == IDC_FRAMEGAP || LOWORD(wParam) == IDC_HIDETIME || LOWORD(wParam) == IDC_CLIPBORDER || LOWORD(wParam) == IDC_ROWGAP || LOWORD(wParam) == IDC_TITLETEXT ||
- LOWORD(wParam) == IDC_MAXSIZEHEIGHT || LOWORD(wParam) == IDC_CLEFT || LOWORD(wParam) == IDC_CRIGHT || LOWORD(wParam) == IDC_CTOP
+ LOWORD(wParam) == IDC_MAXSIZEHEIGHT || LOWORD(wParam) == IDC_CLEFT || LOWORD(wParam) == IDC_CRIGHT || LOWORD(wParam) == IDC_CTOP
|| LOWORD(wParam) == IDC_CBOTTOM) && (HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus()))
return 0;
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
@@ -212,7 +212,7 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l SetWindowPlacement(pcli->hwndContactList, &p);
ShowWindow(pcli->hwndContactList, SW_SHOW);
- }
+ }
else
{
LONG style;
@@ -257,7 +257,7 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l }
cfg::dat.dwFlags = IsDlgButtonChecked(hwndDlg, IDC_ROUNDEDBORDER) ? cfg::dat.dwFlags | CLUI_FRAME_ROUNDEDFRAME : cfg::dat.dwFlags & ~CLUI_FRAME_ROUNDEDFRAME;
cfg::writeByte("CLUI", "AutoSize", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE));
-
+
if ((cfg::dat.autosize = IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE) ? 1 : 0)) {
SendMessage(pcli->hwndContactList, WM_SIZE, 0, 0);
SendMessage(pcli->hwndContactTree, WM_SIZE, 0, 0);
diff --git a/plugins/Clist_nicer/src/cluiservices.cpp b/plugins/Clist_nicer/src/cluiservices.cpp index cd8cdbcaf7..2dea0bfa67 100644 --- a/plugins/Clist_nicer/src/cluiservices.cpp +++ b/plugins/Clist_nicer/src/cluiservices.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -19,10 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-UNICODE done
-
*/
+
#include <commonheaders.h>
#include "../cluiframes/cluiframes.h"
@@ -102,7 +101,7 @@ void CluiProtocolStatusChanged( int parStatus, const char* szProto ) for ( i=0; i < protoCount; i++ )
if ( pcli->pfnGetProtocolVisibility( accs[i]->szModuleName ))
toshow++;
-
+
if ( toshow > 0 ) {
for ( part=0, i=0; i < protoCount; i++ ) {
if ( !pcli->pfnGetProtocolVisibility( accs[i]->szModuleName ))
diff --git a/plugins/Clist_nicer/src/config.cpp b/plugins/Clist_nicer/src/config.cpp index 9bd0a8ade8..8e5e232b26 100644 --- a/plugins/Clist_nicer/src/config.cpp +++ b/plugins/Clist_nicer/src/config.cpp @@ -1,31 +1,26 @@ /*
- * Miranda IM: the free IM client for Microsoft* Windows*
- *
- * Copyright 2000-2010 Miranda ICQ/IM project,
- * all portions of this codebase are copyrighted to the people
- * listed in contributors.txt.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * you should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * part of clist_nicer plugin for Miranda.
- *
- * (C) 2005-2010 by silvercircle _at_ gmail _dot_ com and contributors
- *
- * $Id: config.cpp 12887 2010-10-04 03:58:32Z borkra $
- *
- */
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
#include <commonheaders.h>
diff --git a/plugins/Clist_nicer/src/contact.cpp b/plugins/Clist_nicer/src/contact.cpp index 0c3201a434..c379979a79 100644 --- a/plugins/Clist_nicer/src/contact.cpp +++ b/plugins/Clist_nicer/src/contact.cpp @@ -1,34 +1,26 @@ /*
- * astyle --force-indent=tab=4 --brackets=linux --indent-switches
- * --pad=oper --one-line=keep-blocks --unpad=paren
- *
- * Miranda IM: the free IM client for Microsoft* Windows*
- *
- * Copyright 2000-2010 Miranda ICQ/IM project,
- * all portions of this codebase are copyrighted to the people
- * listed in contributors.txt.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * you should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * part of clist_nicer plugin for Miranda.
- *
- * (C) 2005-2010 by silvercircle _at_ gmail _dot_ com and contributors
- *
- * $Id: contact.cpp 12535 2010-08-29 23:48:32Z silvercircle $
- *
- */
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
#include <commonheaders.h>
@@ -240,7 +232,7 @@ int __forceinline INTSORT_CompareContacts(const ClcContact* c1, const ClcContact namea = (TCHAR *)c1->szText;
nameb = (TCHAR *)c2->szText;
return CompareString(LOCALE_USER_DEFAULT, NORM_IGNORECASE, namea, -1, nameb, -1) - 2;
-
+
case SORTBY_LASTMSG:
if (c1->pExtra && c2->pExtra)
return c2->pExtra->dwLastMsgTime - c1->pExtra->dwLastMsgTime;
@@ -249,7 +241,7 @@ int __forceinline INTSORT_CompareContacts(const ClcContact* c1, const ClcContact DWORD timestamp2 = INTSORT_GetLastMsgTime(c2->hContact);
return timestamp2 - timestamp1;
}
-
+
case SORTBY_FREQUENCY:
if ( c1->pExtra && c2->pExtra)
return c1->pExtra->msgFrequency - c2->pExtra->msgFrequency;
diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp index 37c3a00a0c..d72f0ec13d 100644 --- a/plugins/Clist_nicer/src/extBackg.cpp +++ b/plugins/Clist_nicer/src/extBackg.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp index f7ac4a02ba..bd087c7b0a 100644 --- a/plugins/Clist_nicer/src/init.cpp +++ b/plugins/Clist_nicer/src/init.cpp @@ -1,34 +1,26 @@ /*
- * astyle --force-indent=tab=4 --brackets=linux --indent-switches
- * --pad=oper --one-line=keep-blocks --unpad=paren
- *
- * Miranda IM: the free IM client for Microsoft* Windows*
- *
- * Copyright 2000-2010 Miranda ICQ/IM project,
- * all portions of this codebase are copyrighted to the people
- * listed in contributors.txt.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * you should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * part of clist_nicer plugin for Miranda.
- *
- * (C) 2005-2010 by silvercircle _at_ gmail _dot_ com and contributors
- *
- * $Id: init.cpp 13596 2011-04-15 19:07:23Z george.hazan $
- *
- */
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
#include <commonheaders.h>
#include "../cluiframes/cluiframes.h"
diff --git a/plugins/Clist_nicer/src/rowheight_funcs.cpp b/plugins/Clist_nicer/src/rowheight_funcs.cpp index b2460204d3..0d3de22840 100644 --- a/plugins/Clist_nicer/src/rowheight_funcs.cpp +++ b/plugins/Clist_nicer/src/rowheight_funcs.cpp @@ -1,34 +1,26 @@ /*
- * astyle --force-indent=tab=4 --brackets=linux --indent-switches
- * --pad=oper --one-line=keep-blocks --unpad=paren
- *
- * Miranda IM: the free IM client for Microsoft* Windows*
- *
- * Copyright 2000-2010 Miranda ICQ/IM project,
- * all portions of this codebase are copyrighted to the people
- * listed in contributors.txt.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * you should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * part of clist_nicer plugin for Miranda.
- *
- * (C) 2005-2010 by silvercircle _at_ gmail _dot_ com and contributors
- *
- * $Id: rowheight_funcs.cpp 12484 2010-08-27 04:02:43Z silvercircle $
- *
- */
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
#include <commonheaders.h>
#include <rowheight_funcs.h>
@@ -154,10 +146,10 @@ void RowHeight::calcRowHeights(ClcData *dat, HWND hwnd) line_num = -1;
Clear(dat);
-
+
while(TRUE)
{
- if (group->scanIndex==group->cl.count)
+ if (group->scanIndex==group->cl.count)
{
group=group->parent;
indent--;
diff --git a/plugins/Clist_nicer/src/statusbar.cpp b/plugins/Clist_nicer/src/statusbar.cpp index 33014a64f7..fa2887f0e8 100644 --- a/plugins/Clist_nicer/src/statusbar.cpp +++ b/plugins/Clist_nicer/src/statusbar.cpp @@ -1,8 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -41,7 +43,7 @@ LRESULT CALLBACK NewStatusBarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case WM_SETCURSOR:
{
POINT pt;
- GetCursorPos(&pt);
+ GetCursorPos(&pt);
SendMessage(GetParent(hwnd),msg,wParam,lParam);
if (pt.x == ptMouse.x && pt.y == ptMouse.y)
@@ -49,10 +51,10 @@ LRESULT CALLBACK NewStatusBarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM ptMouse = pt;
if (tooltip_active){
- KillTimer(hwnd, TIMERID_HOVER);
+ KillTimer(hwnd, TIMERID_HOVER);
if ( !NotifyEventHooks(hStatusBarHideToolTipEvent, 0, 0))
CallService("mToolTip/HideTip", 0, 0);
- tooltip_active = FALSE;
+ tooltip_active = FALSE;
}
KillTimer(hwnd, TIMERID_HOVER);
SetTimer(hwnd, TIMERID_HOVER, 750, 0);
@@ -75,10 +77,10 @@ LRESULT CALLBACK NewStatusBarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case WM_LBUTTONDOWN:
case WM_RBUTTONDOWN:
- KillTimer(hwnd, TIMERID_HOVER);
+ KillTimer(hwnd, TIMERID_HOVER);
if ( !NotifyEventHooks(hStatusBarHideToolTipEvent, 0, 0))
CallService("mToolTip/HideTip", 0, 0);
- tooltip_active = FALSE;
+ tooltip_active = FALSE;
break;
case WM_PAINT:
diff --git a/plugins/Clist_nicer/src/stdafx.cpp b/plugins/Clist_nicer/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/Clist_nicer/src/stdafx.cpp +++ b/plugins/Clist_nicer/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp index 458f03ce08..db08996df5 100644 --- a/plugins/Clist_nicer/src/viewmodes.cpp +++ b/plugins/Clist_nicer/src/viewmodes.cpp @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -18,11 +20,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-contact list view modes (CLVM)
-
-$Id: viewmodes.cpp 13824 2011-09-03 06:32:11Z borkra $
-
*/
#include <commonheaders.h>
@@ -398,7 +395,7 @@ void SaveState() DWORD options, lmdat;
SendDlgItemMessageA(clvmHwnd, IDC_VIEWMODES, LB_GETTEXT, clvm_curItem, (LPARAM)szModeName);
dwGlobalMask = GetMaskForItem(hInfoItem);
-
+
for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
hItem = (HANDLE)SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);
if (hItem) {
@@ -1118,7 +1115,7 @@ void ApplyViewMode(const char *name) cfg::dat.bFilterEffective |= CLVM_FILTER_LASTMSG_NEWERTHAN;
else
cfg::dat.bFilterEffective |= CLVM_FILTER_LASTMSG_OLDERTHAN;
-
+
DWORD unit = LOWORD(cfg::dat.lastMsgFilter);
switch(HIBYTE(HIWORD(cfg::dat.lastMsgFilter))) {
case 0:
diff --git a/plugins/Clist_nicer/src/wallpaper.cpp b/plugins/Clist_nicer/src/wallpaper.cpp index 73c513db74..51b11f03ef 100644 --- a/plugins/Clist_nicer/src/wallpaper.cpp +++ b/plugins/Clist_nicer/src/wallpaper.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -43,7 +44,7 @@ void GetWallpaperPattern() if (strlen(wpbuf)>0)
{
hPattern = (HBITMAP)CallService(MS_UTILS_LOADBITMAP,0,(LPARAM)wpbuf);
- }
+ }
}
void GetWallpaperStyle()
diff --git a/plugins/CmdLine/MimCmd/src/stdafx.cpp b/plugins/CmdLine/MimCmd/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/CmdLine/MimCmd/src/stdafx.cpp +++ b/plugins/CmdLine/MimCmd/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CmdLine/src/stdafx.cpp b/plugins/CmdLine/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/CmdLine/src/stdafx.cpp +++ b/plugins/CmdLine/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Console/src/Console.cpp b/plugins/Console/src/Console.cpp index 0967c35341..9899814098 100644 --- a/plugins/Console/src/Console.cpp +++ b/plugins/Console/src/Console.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -114,7 +115,7 @@ static int Openfile(TCHAR *outputFile, int selection); static HANDLE hTTBButt = 0;
-static IconItem iconList[] =
+static IconItem iconList[] =
{
{ "Show", "Console_Up", IDI_BTN_UP },
{ "Hide", "Console_Down", IDI_BTN_DN },
@@ -314,7 +315,7 @@ static LRESULT CALLBACK SubclassProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lPa return 0;
}
break;
- }
+ }
return mir_callNextSubclass(hwnd, SubclassProc, msg, wParam, lParam);
}
@@ -632,7 +633,7 @@ static INT_PTR CALLBACK ConsoleDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,L TCHAR title[MAX_PATH];
TCHAR name[MAX_PATH] = {0};
TCHAR path[MAX_PATH] = {0};
-
+
hTabs = GetDlgItem(hwndDlg, IDC_TABS);
//TabCtrl_SetMinTabWidth(hTabs, 100);
diff --git a/plugins/Console/src/commonheaders.h b/plugins/Console/src/commonheaders.h index 4f6f420148..d41768aaeb 100644 --- a/plugins/Console/src/commonheaders.h +++ b/plugins/Console/src/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Console/src/init.cpp b/plugins/Console/src/init.cpp index 4a31091bd2..0b8637c1dc 100644 --- a/plugins/Console/src/init.cpp +++ b/plugins/Console/src/init.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Console/src/stdafx.cpp b/plugins/Console/src/stdafx.cpp index 872a8840fa..78db5183fb 100644 --- a/plugins/Console/src/stdafx.cpp +++ b/plugins/Console/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/ContactsPlus/src/stdafx.cpp b/plugins/ContactsPlus/src/stdafx.cpp index f9fb12703d..b4332ff069 100644 --- a/plugins/ContactsPlus/src/stdafx.cpp +++ b/plugins/ContactsPlus/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CountryFlags/src/stdafx.cpp b/plugins/CountryFlags/src/stdafx.cpp index e1b76ab747..20da665fbb 100644 --- a/plugins/CountryFlags/src/stdafx.cpp +++ b/plugins/CountryFlags/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CrashDumper/src/stdafx.cpp b/plugins/CrashDumper/src/stdafx.cpp index 2ccb9226de..5c858f3d54 100644 --- a/plugins/CrashDumper/src/stdafx.cpp +++ b/plugins/CrashDumper/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CryptoPP/src/stdafx.cpp b/plugins/CryptoPP/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/CryptoPP/src/stdafx.cpp +++ b/plugins/CryptoPP/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CyrTranslit/src/stdafx.cpp b/plugins/CyrTranslit/src/stdafx.cpp index 96747e025f..28f21109fb 100644 --- a/plugins/CyrTranslit/src/stdafx.cpp +++ b/plugins/CyrTranslit/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Db3x_mmap/src/commonheaders.h b/plugins/Db3x_mmap/src/commonheaders.h index 471aa33453..3467c6ddee 100644 --- a/plugins/Db3x_mmap/src/commonheaders.h +++ b/plugins/Db3x_mmap/src/commonheaders.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/database.cpp b/plugins/Db3x_mmap/src/database.cpp index c6d7f45131..1df59e9575 100644 --- a/plugins/Db3x_mmap/src/database.cpp +++ b/plugins/Db3x_mmap/src/database.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/database.h b/plugins/Db3x_mmap/src/database.h index d66e4fd693..00bad441cd 100644 --- a/plugins/Db3x_mmap/src/database.h +++ b/plugins/Db3x_mmap/src/database.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbcache.cpp b/plugins/Db3x_mmap/src/dbcache.cpp index d5700d2db7..76126f7885 100644 --- a/plugins/Db3x_mmap/src/dbcache.cpp +++ b/plugins/Db3x_mmap/src/dbcache.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbcontacts.cpp b/plugins/Db3x_mmap/src/dbcontacts.cpp index 3131b1f7da..ee65364bf0 100644 --- a/plugins/Db3x_mmap/src/dbcontacts.cpp +++ b/plugins/Db3x_mmap/src/dbcontacts.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbcrypt.cpp b/plugins/Db3x_mmap/src/dbcrypt.cpp index f181f53cd2..96981fb8f0 100644 --- a/plugins/Db3x_mmap/src/dbcrypt.cpp +++ b/plugins/Db3x_mmap/src/dbcrypt.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbevents.cpp b/plugins/Db3x_mmap/src/dbevents.cpp index 3399459539..a998bc2484 100644 --- a/plugins/Db3x_mmap/src/dbevents.cpp +++ b/plugins/Db3x_mmap/src/dbevents.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbheaders.cpp b/plugins/Db3x_mmap/src/dbheaders.cpp index 899dcdedc7..f4ec4666c5 100644 --- a/plugins/Db3x_mmap/src/dbheaders.cpp +++ b/plugins/Db3x_mmap/src/dbheaders.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbintf.cpp b/plugins/Db3x_mmap/src/dbintf.cpp index f5f1b3738b..c595371fae 100644 --- a/plugins/Db3x_mmap/src/dbintf.cpp +++ b/plugins/Db3x_mmap/src/dbintf.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbintf.h b/plugins/Db3x_mmap/src/dbintf.h index 0ac1db9353..b3eb943f0a 100644 --- a/plugins/Db3x_mmap/src/dbintf.h +++ b/plugins/Db3x_mmap/src/dbintf.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbintfm.cpp b/plugins/Db3x_mmap/src/dbintfm.cpp index 3dc1e91294..15c52654ac 100644 --- a/plugins/Db3x_mmap/src/dbintfm.cpp +++ b/plugins/Db3x_mmap/src/dbintfm.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbmodulechain.cpp b/plugins/Db3x_mmap/src/dbmodulechain.cpp index 2a00073395..743bbd2b21 100644 --- a/plugins/Db3x_mmap/src/dbmodulechain.cpp +++ b/plugins/Db3x_mmap/src/dbmodulechain.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbsettings.cpp b/plugins/Db3x_mmap/src/dbsettings.cpp index 77affa8b2c..0383a12e41 100644 --- a/plugins/Db3x_mmap/src/dbsettings.cpp +++ b/plugins/Db3x_mmap/src/dbsettings.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbtool/eventchain.cpp b/plugins/Db3x_mmap/src/dbtool/eventchain.cpp index a5a03cbecd..1aa5b2ecb4 100644 --- a/plugins/Db3x_mmap/src/dbtool/eventchain.cpp +++ b/plugins/Db3x_mmap/src/dbtool/eventchain.cpp @@ -1,9 +1,11 @@ /*
+
Miranda Database Tool
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2011 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright 2000-2011 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -258,7 +260,7 @@ int CDb3Base::WorkEventChain(DWORD ofsContact,DBContact *dbc,int firstTime) }
free(dbePrev);
}
- else if (!firstTime && dbeNew->timestamp < lastTimestamp)
+ else if (!firstTime && dbeNew->timestamp < lastTimestamp)
{
DWORD found = 0;
DBEvent dbeTmp;
@@ -266,7 +268,7 @@ int CDb3Base::WorkEventChain(DWORD ofsContact,DBContact *dbc,int firstTime) if (cb->bCheckOnly)
{
- if (!cb->bAggressive)
+ if (!cb->bAggressive)
{
ofsTmp = dbeOld.ofsPrev;
while(PeekSegment(ofsTmp,&dbeTmp,sizeof(dbeTmp)) == ERROR_SUCCESS)
@@ -274,7 +276,7 @@ int CDb3Base::WorkEventChain(DWORD ofsContact,DBContact *dbc,int firstTime) if (dbeTmp.ofsPrev == ofsContact) {
found = 1;
break;
- }
+ }
if (dbeTmp.timestamp < dbeNew->timestamp) {
found = 2;
break;
@@ -283,7 +285,7 @@ int CDb3Base::WorkEventChain(DWORD ofsContact,DBContact *dbc,int firstTime) }
}
cb->pfnAddLogMessage(STATUS_WARNING,TranslateT("Event position in chain is not correct"));
- }
+ }
else
{
ofsTmp = ofsDestPrevEvent;
@@ -292,7 +294,7 @@ int CDb3Base::WorkEventChain(DWORD ofsContact,DBContact *dbc,int firstTime) if (dbeTmp.ofsPrev == ofsContact) {
found = 1;
break;
- }
+ }
if (dbeTmp.timestamp < dbeNew->timestamp) {
found = 2;
break;
diff --git a/plugins/Db3x_mmap/src/init.cpp b/plugins/Db3x_mmap/src/init.cpp index 315fdc4d65..605a303623 100644 --- a/plugins/Db3x_mmap/src/init.cpp +++ b/plugins/Db3x_mmap/src/init.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/stdafx.cpp b/plugins/Db3x_mmap/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/Db3x_mmap/src/stdafx.cpp +++ b/plugins/Db3x_mmap/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Db3x_mmap/src/ui.cpp b/plugins/Db3x_mmap/src/ui.cpp index 3d0b6aa62c..902791c1b2 100644 --- a/plugins/Db3x_mmap/src/ui.cpp +++ b/plugins/Db3x_mmap/src/ui.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/version.h b/plugins/Db3x_mmap/src/version.h index 42d3c6aba4..9b9e467d36 100644 --- a/plugins/Db3x_mmap/src/version.h +++ b/plugins/Db3x_mmap/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda-NG project"
#define __AUTHOREMAIL "bio@msx.ru; ghazan@miranda.im"
#define __AUTHORWEB "http://miranda-ng.org/p/Dbx_mmap/"
-#define __COPYRIGHT "© 2012-13 Miranda NG project"
+#define __COPYRIGHT "© 2012-14 Miranda NG project"
diff --git a/plugins/DbChecker/src/stdafx.cpp b/plugins/DbChecker/src/stdafx.cpp index 739a50a3b7..6e1a5e59fd 100644 --- a/plugins/DbChecker/src/stdafx.cpp +++ b/plugins/DbChecker/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/DbEditorPP/src/stdafx.cpp b/plugins/DbEditorPP/src/stdafx.cpp index 48d92d3d56..5304ea985c 100644 --- a/plugins/DbEditorPP/src/stdafx.cpp +++ b/plugins/DbEditorPP/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Db_autobackups/src/options.h b/plugins/Db_autobackups/src/options.h index 2a40fef27f..86aa4509a6 100644 --- a/plugins/Db_autobackups/src/options.h +++ b/plugins/Db_autobackups/src/options.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db_autobackups/src/stdafx.cpp b/plugins/Db_autobackups/src/stdafx.cpp index 48d92d3d56..5304ea985c 100644 --- a/plugins/Db_autobackups/src/stdafx.cpp +++ b/plugins/Db_autobackups/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Dbx_mmap_SA/src/commonheaders.h b/plugins/Dbx_mmap_SA/src/commonheaders.h index f95ac242d8..ade3aa33c7 100644 --- a/plugins/Dbx_mmap_SA/src/commonheaders.h +++ b/plugins/Dbx_mmap_SA/src/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Dbx_mmap_SA/src/dbintf_sa.cpp b/plugins/Dbx_mmap_SA/src/dbintf_sa.cpp index f3d9a7549d..a2e7a04270 100644 --- a/plugins/Dbx_mmap_SA/src/dbintf_sa.cpp +++ b/plugins/Dbx_mmap_SA/src/dbintf_sa.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Dbx_mmap_SA/src/dbintf_sa.h b/plugins/Dbx_mmap_SA/src/dbintf_sa.h index 519e5c50bb..1412ba71b6 100644 --- a/plugins/Dbx_mmap_SA/src/dbintf_sa.h +++ b/plugins/Dbx_mmap_SA/src/dbintf_sa.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Dbx_mmap_SA/src/init.cpp b/plugins/Dbx_mmap_SA/src/init.cpp index fffb7dd314..5501e29b64 100644 --- a/plugins/Dbx_mmap_SA/src/init.cpp +++ b/plugins/Dbx_mmap_SA/src/init.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Dbx_mmap_SA/src/options.h b/plugins/Dbx_mmap_SA/src/options.h index efabf3eba5..30e5cb1dd4 100644 --- a/plugins/Dbx_mmap_SA/src/options.h +++ b/plugins/Dbx_mmap_SA/src/options.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Dbx_mmap_SA/src/stdafx.cpp b/plugins/Dbx_mmap_SA/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/Dbx_mmap_SA/src/stdafx.cpp +++ b/plugins/Dbx_mmap_SA/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Dbx_tree/src/stdafx.cpp b/plugins/Dbx_tree/src/stdafx.cpp index 3fab47cba1..ed529fed13 100644 --- a/plugins/Dbx_tree/src/stdafx.cpp +++ b/plugins/Dbx_tree/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/ExternalAPI/m_assocmgr.h b/plugins/ExternalAPI/m_assocmgr.h index 94f6e203f9..a096cbd274 100644 --- a/plugins/ExternalAPI/m_assocmgr.h +++ b/plugins/ExternalAPI/m_assocmgr.h @@ -1,8 +1,9 @@ /*
'File Association Manager'-Plugin for
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
Copyright (C) 2005-2007 H. Herkenrath
This program is free software; you can redistribute it and/or
@@ -54,7 +55,7 @@ typedef struct { const char *pszService; // service to call when a file is opened
// this service will be called with lParam set to
// the file name being opened including path.
- // it can be assumed that the provided file name
+ // it can be assumed that the provided file name
// is always the long path name.
// return zero on suceess, nonzero on error.
// Note: set this to NULL to pass the file name as
diff --git a/plugins/ExternalAPI/m_db3xsa.h b/plugins/ExternalAPI/m_db3xsa.h index b6dbfd0429..f1e5334fc4 100644 --- a/plugins/ExternalAPI/m_db3xsa.h +++ b/plugins/ExternalAPI/m_db3xsa.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2007 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-07 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -48,7 +49,7 @@ lParam=0 /* DB/GetProfilePath( W ) v0.5.1.5+
Gets the path of the profile currently being used by the database module. This
-path does not include the last '\'. It is appended with the profile's name if
+path does not include the last '\'. It is appended with the profile's name if
ProfileSubDir=yes is set in the mirandaboot.ini.
wParam=( WPARAM )( int )cbName
lParam=( LPARAM )( char* )pszName
@@ -79,7 +80,7 @@ It supports: %PROFILENAME% - expands to the name of the current profile,
and all windows like environment variables such as:
%USERPROFILE%, %WINDIR%, ...
-It returns the length of the absolute path in characters on success or
+It returns the length of the absolute path in characters on success or
0 if any of the environment variables was not translated.
wParam=relative source path ( must be smaller than MAX_PATH )
lParam=absolute destination path ( must be larger or equal to MAX_PATH )
@@ -98,7 +99,7 @@ lParam=absolute destination path ( must be larger or equal to MAX_PATH ) /* Utils/PathToRelative( W ) v0.5.1.5+
This service parses the given absolute path and translates it to a string
-containing as much environment variables as possible.
+containing as much environment variables as possible.
The return value is the length of the relative path in characters.
wParam=absolute source path ( must be smaller than MAX_PATH )
lParam=relative destination path ( must be larger or equal to MAX_PATH )
diff --git a/plugins/ExternalAPI/m_langman.h b/plugins/ExternalAPI/m_langman.h index 746244a42c..1a7b5bf9c2 100644 --- a/plugins/ExternalAPI/m_langman.h +++ b/plugins/ExternalAPI/m_langman.h @@ -1,8 +1,9 @@ /*
'Language Pack Manager'-Plugin for
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
Copyright (C) 2005-2007 H. Herkenrath
This program is free software; you can redistribute it and/or
@@ -38,4 +39,3 @@ Returns 0 on success, nonzero otherwise. #endif
#endif // M_LANGMAN_H
-
diff --git a/plugins/ExternalAPI/m_metacontacts.h b/plugins/ExternalAPI/m_metacontacts.h index 1da12b97fa..541dfc0251 100644 --- a/plugins/ExternalAPI/m_metacontacts.h +++ b/plugins/ExternalAPI/m_metacontacts.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright © 2004 Universite Louis PASTEUR, STRASBOURG.
-Copyright © 2004 Scott Ellis (www.scottellis.com.au mail@scottellis.com.au)
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2004 Universite Louis PASTEUR, STRASBOURG.
+Copyright (c) 2004 Scott Ellis (www.scottellis.com.au mail@scottellis.com.au)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -100,7 +101,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // method to get state of 'force' for a metacontact
// wParam=(HANDLE)hMetaContact
// lParam= (DWORD)&contact_number or NULL
-//
+//
// if lparam supplied, the contact_number of the contatct 'in force' will be copied to the address it points to,
// or if none is in force, the value (DWORD)-1 will be copied
// (v0.8.0.8+ returns 1 if 'force default' is true with *lParam == default contact number, else returns 0 with *lParam as above)
@@ -111,7 +112,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // lParam=(HANDLE)hDefaultContact
#define ME_MC_DEFAULTTCHANGED "MetaContacts/DefaultChanged"
-// fired when a metacontact's subcontacts change (fired upon creation of metacontact, when contacts are added or removed, and when
+// fired when a metacontact's subcontacts change (fired upon creation of metacontact, when contacts are added or removed, and when
// contacts are reordered) - a signal to re-read metacontact data
// wParam=(HANDLE)hMetaContact
// lParam=0
@@ -119,12 +120,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // fired when a metacontact is forced to send using a specific subcontact
// wParam=(HANDLE)hMetaContact
-// lParam=(HANDLE)hForceContact
+// lParam=(HANDLE)hForceContact
#define ME_MC_FORCESEND "MetaContacts/ForceSend"
// fired when a metacontact is 'unforced' to send using a specific subcontact
// wParam=(HANDLE)hMetaContact
-// lParam=0
+// lParam=0
#define ME_MC_UNFORCESEND "MetaContacts/UnforceSend"
// method to get protocol name - used to be sure you're dealing with a "real" metacontacts plugin :)
diff --git a/plugins/ExternalAPI/m_proto_listeningto.h b/plugins/ExternalAPI/m_proto_listeningto.h index 66d3b77f20..c0e7051822 100644 --- a/plugins/ExternalAPI/m_proto_listeningto.h +++ b/plugins/ExternalAPI/m_proto_listeningto.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2006 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-06 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -95,7 +96,7 @@ typedef struct { // The strings inside the struct need to be free using miranda free.
#define PS_GET_LISTENINGTO "/GetListeningTo"
-// Also the protocol have to save a string with the text the other user is (probabily)
+// Also the protocol have to save a string with the text the other user is (probabily)
// seeing under the main db key: <protocol>/ListeningTo
// For a contact, the protocol should store the listening info as an string inside
@@ -118,14 +119,14 @@ typedef struct { // Returns a TCHAR* containg the user setting. This need to be free using miranda free.
#define MS_LISTENINGTO_GETTEXTFORMAT "ListeningTo/GetTextFormat"
-// Get the text the user wants him / his contacts to see, parsed with the info sent to
+// Get the text the user wants him / his contacts to see, parsed with the info sent to
// this service. Uses the same variables as the above service to the default text.
// wParam = TCHAR* - default text for this protocol
// lParam = LISTENINGTOINFO *
// Returns a TCHAR* containg the parsed text. This need to be free using miranda free.
#define MS_LISTENINGTO_GETPARSEDTEXT "ListeningTo/GetParsedText"
-// Get if the contact options about how to show the music info should be overriten or
+// Get if the contact options about how to show the music info should be overriten or
// not.
// wParam = NULL
// lParam = hContact
@@ -140,4 +141,3 @@ typedef struct { #endif // M_PROTO_LISTENINGTO_H__
-
diff --git a/plugins/ExternalAPI/m_script.h b/plugins/ExternalAPI/m_script.h index 957333af7e..2388bbaad1 100644 --- a/plugins/ExternalAPI/m_script.h +++ b/plugins/ExternalAPI/m_script.h @@ -1,6 +1,6 @@ /*
-Miranda Scripting Plugin for Miranda-IM
+Miranda Scripting Plugin for Miranda NG
Copyright 2004-2006 Piotr Pawluczuk (www.pawluczuk.info)
This program is free software; you can redistribute it and/or
@@ -19,9 +19,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/ExternalAPI/m_shutdown.h b/plugins/ExternalAPI/m_shutdown.h index 3db262e885..239a728d82 100644 --- a/plugins/ExternalAPI/m_shutdown.h +++ b/plugins/ExternalAPI/m_shutdown.h @@ -1,8 +1,9 @@ /*
'AutoShutdown'-Plugin for
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
Copyright (C) 2004-2007 H. Herkenrath
This program is free software; you can redistribute it and/or
@@ -46,7 +47,7 @@ Returns 0 on success, nonzero otherwise. #define MS_AUTOSHUTDOWN_SHUTDOWN "AutoShutdown/Shutdown"
/* shutdown types */
-#define SDSDT_CLOSEMIRANDA 1 // close miranda process
+#define SDSDT_CLOSEMIRANDA 1 // close miranda process
#define SDSDT_SETMIRANDAOFFLINE 2 // set all protocols to offline
#define SDSDT_LOGOFF 3 // logoff from Windows
#define SDSDT_REBOOT 4 // reboot computer
@@ -72,14 +73,14 @@ Returns a pointer to a string on success, NULL on error. #define GSTDF_UNICODE 0x0002 // returns a Unicode string
#define GSTDF_UNTRANSLATED 0x0004 // returns an untranslated string
#if defined(_UNICODE)
- #define GSTDF_TCHAR GSTDF_UNICODE // will return WCHAR*
+ #define GSTDF_TCHAR GSTDF_UNICODE // will return WCHAR*
#else
#define GSTDF_TCHAR 0 // will return char*, as usual
#endif
/* Check if shutdown type is enabled v1.4.0.0+
Tests if a specific shutdown type is activated and its use is possible
-on the system. For example hibernate and stand-by modes are not available on
+on the system. For example hibernate and stand-by modes are not available on
older versions of Windows (needs Windows ME/2000+).
Shutdown might also be prohibited by security restrictions.
This services checks it all.
diff --git a/plugins/ExternalAPI/m_skin_eng.h b/plugins/ExternalAPI/m_skin_eng.h index b25a19afc5..b00178d623 100644 --- a/plugins/ExternalAPI/m_skin_eng.h +++ b/plugins/ExternalAPI/m_skin_eng.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -28,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /*defaults*/
#define DEFAULT_FIT_MODE FM_STRETCH
-#define DEFAULT_STYLE ST_BRUSH
+#define DEFAULT_STYLE ST_BRUSH
#define DEFAULT_BKCOLOUR GetSysColor(COLOR_3DFACE)
#define DEFAULT_SELBKCOLOUR GetSysColor(COLOR_HIGHLIGHT)
#define SIZING_MARGIN 3
@@ -65,7 +66,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /*SERVICES*/
-//toggle the 'hide offline contacts' flag and call CLUI
+//toggle the 'hide offline contacts' flag and call CLUI
//wParam=0
//lParam=0
#define MS_CLIST_TOGGLEHIDEOFFLINE "CList/ToggleHideOffline"
@@ -93,7 +94,7 @@ typedef struct s_DEF_SKIN_OBJECT_PARAMS } DEF_SKIN_OBJECT_PARAMS;
-// Request painting glyph object
+// Request painting glyph object
// wParam = pointer to SKINDRAWREQUEST structure
// lParam = 0
#define MS_SKIN_DRAWGLYPH "ModernList/DrawGlyph"
@@ -109,11 +110,11 @@ typedef struct s_SKINDRAWREQUEST char szObjectID[255]; // Unic Object ID (path) to paint
RECT rcDestRect; // Rectangle to fit
RECT rcClipRect; // Rectangle to paint in.
- HDC hDC; // Handler to device context to paint in.
+ HDC hDC; // Handler to device context to paint in.
} SKINDRAWREQUEST,*LPSKINDRAWREQUEST;
/* SKINOBJECTDESCRIPTOR opbject descriptor structure */
-typedef struct tagSKINOBJECTDESCRIPTOR
+typedef struct tagSKINOBJECTDESCRIPTOR
{
BYTE bType; // One of OT_* values.
char* szObjectID; // Unic Object ID (path) [255] max
@@ -123,9 +124,9 @@ typedef struct tagSKINOBJECTDESCRIPTOR /* SKINOBJECTDESCRIPTOR opbject descriptor structure */
typedef struct s_GLYPHOBJECT
{
- BYTE Style; // One of ST_* values
+ BYTE Style; // One of ST_* values
HBITMAP hGlyph; // Bitmap handler (for internal use only)
- DWORD dwTop, dwLeft, dwBottom, dwRight; // Margins
+ DWORD dwTop, dwLeft, dwBottom, dwRight; // Margins
char* szFileName; // FileName of image
DWORD dwColor; // Fill color
BYTE dwAlpha; // Constant alpha-transparency level
@@ -200,11 +201,11 @@ int __inline CreateGlyphedObject(char * ObjID); //// Creating and registering objects
//int __inline CreateGlyphedObject(char * ObjID)
-//{
+//{
// DEF_SKIN_OBJECT_PARAMS prm={0};
// prm.defColor=DEFAULT_BKCOLOUR;
// prm.defStyle=DEFAULT_STYLE;
-// prm.szObjectID=ObjID;
+// prm.szObjectID=ObjID;
// return CallService(MS_SKIN_REGISTERDEFOBJECT,(WPARAM)&prm,0);
//}
static BOOL __inline ScreenToClientRect(HWND hWnd, LPRECT lpRect)
@@ -242,7 +243,7 @@ static BOOL __inline ScreenToClientRect(HWND hWnd, LPRECT lpRect) // prm.defStyle=defStyle;
// prm.szObjectID=ObjID;
// return CallService(MS_SKIN_REGISTERDEFOBJECT,(WPARAM)&prm,0);
-//}
+//}
//int __inline CreateGlyphedObjectDefColor(char * ObjID,DWORD defColor)
//{
// DEF_SKIN_OBJECT_PARAMS prm={0};
@@ -250,14 +251,14 @@ static BOOL __inline ScreenToClientRect(HWND hWnd, LPRECT lpRect) // prm.defStyle=ST_BRUSH;
// prm.szObjectID=ObjID;
// return CallService(MS_SKIN_REGISTERDEFOBJECT,(WPARAM)&prm,0);
-//}
+//}
static int __inline SkinDrawGlyph(HDC hdc, RECT * rcSize, RECT * rcClip, char * objectID)
{
SKINDRAWREQUEST rq;
if (!objectID) return 0;
rq.hDC=hdc;
rq.rcDestRect=*rcSize;
- rq.rcClipRect=*rcClip;
+ rq.rcClipRect=*rcClip;
lstrcpynA(rq.szObjectID,objectID,sizeof(rq.szObjectID));
return CallService(MS_SKIN_DRAWGLYPH,(WPARAM)&rq,0);
}
@@ -347,7 +348,7 @@ int __inline SkinInvalidateFrame(HWND hWnd, CONST RECT* lpRect,BOOL bErase) }
// Alpha channel GDI replacements/helpers
-//
+//
// Paints text with correct alpha channel
// wParam - pointer to AlphaTextOutParams
#define MS_SKINENG_ALPHATEXTOUT "SkinEngine/ske_AlphaTextOut"
@@ -388,8 +389,8 @@ typedef struct _DrawIconFixParam int yTop;
HICON hIcon;
int cxWidth;
- int cyWidth;
- UINT istepIfAniCur;
+ int cyWidth;
+ UINT istepIfAniCur;
HBRUSH hbrFlickerFreeDraw;
UINT diFlags;
} DrawIconFixParam;
diff --git a/plugins/ExternalAPI/m_stopspam.h b/plugins/ExternalAPI/m_stopspam.h index ff3ae058fd..8146268fd3 100644 --- a/plugins/ExternalAPI/m_stopspam.h +++ b/plugins/ExternalAPI/m_stopspam.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright © 2004-009 Roman Miklashevsky, A. Petkevich, Kosh&chka, persei
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2004-009 Roman Miklashevsky, A. Petkevich, Kosh&chka, persei
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/ExternalAPI/m_svc_dbepp.h b/plugins/ExternalAPI/m_svc_dbepp.h index a165fd5e71..d728de9ddc 100644 --- a/plugins/ExternalAPI/m_svc_dbepp.h +++ b/plugins/ExternalAPI/m_svc_dbepp.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright © 2003-2011 Bio, Jonathan Gordon
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2003-11 Bio, Jonathan Gordon
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/ExternalAPI/m_userinfoex.h b/plugins/ExternalAPI/m_userinfoex.h index a4d31bf5c7..cc7b1dc572 100644 --- a/plugins/ExternalAPI/m_userinfoex.h +++ b/plugins/ExternalAPI/m_userinfoex.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2009 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-09 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -19,6 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#ifndef _M_USERINFOEX_H_
#define _M_USERINFOEX_H_
/*************************************************************
@@ -38,7 +40,7 @@ Otherwise the default icon is displayed for this treeitem. A dialogbox should call SetWindowLongPtr(hDlg, DWLP_MSGRESULT, PSP_CHANGED) on a PSN_INFOCHANGED notification if
there are unsafed changes and apply button should keep enabled. Otherwise the changed status
of the dialogbox is resetted as well as the changed status of the details dialog box itself if no page
-called this message. Because UserinfoEx now looks for changes in the settings of a user to keep the
+called this message. Because UserinfoEx now looks for changes in the settings of a user to keep the
shown inforamtion up to date.
*/
#define PSP_CHANGED 2
@@ -134,7 +136,7 @@ typedef struct TDlgCommand { /* PSM_ISAEROMODE v0.8.2.1+
-This message can be sent to the propertysheet (details dialog) to examine,
+This message can be sent to the propertysheet (details dialog) to examine,
whether the aero adaption mode is enabled or not. This message should be used in
each propertysheet page's dialog procedure as follows:
@@ -226,7 +228,7 @@ wParam = lParam = not used /* UserInfo/Reminder/Check v0.1.2.16+
This service compares birthday date which is set by the protocol module of each contact
to the first found custom set birthday date. If a difference is detected, the user is asked
-whether to update the custom set birthday by the one of the protocol or not.
+whether to update the custom set birthday by the one of the protocol or not.
If no custom birthday is set yet and the protocol contains a valid birthday, it is copied to
primary custom module (e.g.: mBirthday or UserInfo).
@@ -247,7 +249,7 @@ lParam = not used /*************************************************************
* Uinfobuttonclass module
*/
-
+
// button styles
#define MBS_DEFBUTTON 0x00001000L // default button
#define MBS_PUSHBUTTON 0x00002000L // toggle button
@@ -291,7 +293,7 @@ wParam - 1 for long dateformat, 0 for short dateformat lParam - CONTACTINFO structure as for all other fields, too
returns 0 on success and 1 on failure
*/
-#define CNF_BIRTHDATE 43 // returns date of birth (string)
+#define CNF_BIRTHDATE 43 // returns date of birth (string)
/*************************************************************
@@ -312,16 +314,16 @@ lParam=not used /* DB/Contact/GetSettingStrEx v0.7.0.1+
This service function reads a database setting from USERINFO module.
-If the setting does not exist, it is looked up in 'pszProto'.
+If the setting does not exist, it is looked up in 'pszProto'.
If 'hContact' points to a MetaContact, the setting is recursivly
searched in all sub contacts, too, starting with the default contact,
if the MetaContact does not directly provide the setting.
-This service can directly replace the default MS_DB_CONTACT_GETSETTING_STR
-for reading contact information from the database.
+This service can directly replace the default MS_DB_CONTACT_GETSETTING_STR
+for reading contact information from the database.
There will be no difference for the user but the possible source of information.
-This service can be used to retrieve all kinds of settings!
-Some versions of the default MS_DB_CONTACT_GETSETTING_STR service return
+This service can be used to retrieve all kinds of settings!
+Some versions of the default MS_DB_CONTACT_GETSETTING_STR service return
an error for BYTE, WORD and DWORD values if cgs.pValue->type is not 0.
wParam = (WPARAM)(HANDLE)hContact
@@ -331,7 +333,7 @@ This service returns one of the results of MS_DB_CONTACT_GETSETTING_STR! */
#define MS_DB_CONTACT_GETSETTING_STR_EX "DB/Contact/GetSettingStrEx"
-static FORCEINLINE INT_PTR
+static FORCEINLINE INT_PTR
DBGetContactSettingEx_Helper(
HANDLE hContact,
const char* pszProto,
diff --git a/plugins/FTPFileYM/src/stdafx.cpp b/plugins/FTPFileYM/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/FTPFileYM/src/stdafx.cpp +++ b/plugins/FTPFileYM/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/FavContacts/src/stdafx.cpp b/plugins/FavContacts/src/stdafx.cpp index 48d92d3d56..5304ea985c 100644 --- a/plugins/FavContacts/src/stdafx.cpp +++ b/plugins/FavContacts/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/FileAsMessage/src/stdafx.cpp b/plugins/FileAsMessage/src/stdafx.cpp index 7495950aac..cd203f524c 100644 --- a/plugins/FileAsMessage/src/stdafx.cpp +++ b/plugins/FileAsMessage/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/FingerprintNG/src/stdafx.cpp b/plugins/FingerprintNG/src/stdafx.cpp index ee7948d6b2..f733198259 100644 --- a/plugins/FingerprintNG/src/stdafx.cpp +++ b/plugins/FingerprintNG/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/FirstRun/src/stdafx.cpp b/plugins/FirstRun/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/FirstRun/src/stdafx.cpp +++ b/plugins/FirstRun/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/FloatingContacts/src/stdafx.cpp b/plugins/FloatingContacts/src/stdafx.cpp index 237f277f33..2c9974cb46 100644 --- a/plugins/FloatingContacts/src/stdafx.cpp +++ b/plugins/FloatingContacts/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Folders/src/stdafx.cpp b/plugins/Folders/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/Folders/src/stdafx.cpp +++ b/plugins/Folders/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Folders/src/version.h b/plugins/Folders/src/version.h index d6bae01c41..7ae6b632e0 100644 --- a/plugins/Folders/src/version.h +++ b/plugins/Folders/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Cristian Libotean, Miranda NG Team"
#define __AUTHOREMAIL "eblis102@yahoo.com"
#define __AUTHORWEB "http://miranda-ng.org/p/Folders/"
-#define __COPYRIGHT "© 2005-2012 Cristian Libotean, 2012-13 Miranda NG Team"
+#define __COPYRIGHT "© 2005-2012 Cristian Libotean, 2012-14 Miranda NG Team"
diff --git a/plugins/HTTPServer/src/stdafx.cpp b/plugins/HTTPServer/src/stdafx.cpp index 3d867e2374..a76f1d2900 100644 --- a/plugins/HTTPServer/src/stdafx.cpp +++ b/plugins/HTTPServer/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/HistoryLinkListPlus/src/stdafx.cpp b/plugins/HistoryLinkListPlus/src/stdafx.cpp index c75ef98345..ca436976fb 100644 --- a/plugins/HistoryLinkListPlus/src/stdafx.cpp +++ b/plugins/HistoryLinkListPlus/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/HistorySweeperLight/src/stdafx.cpp b/plugins/HistorySweeperLight/src/stdafx.cpp index b141ddc9b1..7bce8e1e50 100644 --- a/plugins/HistorySweeperLight/src/stdafx.cpp +++ b/plugins/HistorySweeperLight/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/IEView/src/stdafx.cpp b/plugins/IEView/src/stdafx.cpp index f99bd75a06..04a1185762 100644 --- a/plugins/IEView/src/stdafx.cpp +++ b/plugins/IEView/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/IgnoreState/src/stdafx.cpp b/plugins/IgnoreState/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/IgnoreState/src/stdafx.cpp +++ b/plugins/IgnoreState/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Import/src/stdafx.cpp b/plugins/Import/src/stdafx.cpp index ec5c865b64..2162ae3bc5 100644 --- a/plugins/Import/src/stdafx.cpp +++ b/plugins/Import/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/KeyboardNotify/src/stdafx.cpp b/plugins/KeyboardNotify/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/KeyboardNotify/src/stdafx.cpp +++ b/plugins/KeyboardNotify/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/LangMan/src/stdafx.cpp b/plugins/LangMan/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/LangMan/src/stdafx.cpp +++ b/plugins/LangMan/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/ListeningTo/src/stdafx.cpp b/plugins/ListeningTo/src/stdafx.cpp index 550c908371..3e55ac0306 100644 --- a/plugins/ListeningTo/src/stdafx.cpp +++ b/plugins/ListeningTo/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/MenuItemEx/src/stdafx.cpp b/plugins/MenuItemEx/src/stdafx.cpp index 004cc7b921..1a7b8ae5b6 100644 --- a/plugins/MenuItemEx/src/stdafx.cpp +++ b/plugins/MenuItemEx/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/MetaContacts/src/stdafx.cpp b/plugins/MetaContacts/src/stdafx.cpp index 9bce3593c9..eb479c620d 100644 --- a/plugins/MetaContacts/src/stdafx.cpp +++ b/plugins/MetaContacts/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/MirandaG15/src/stdafx.cpp b/plugins/MirandaG15/src/stdafx.cpp index f33d833b55..7b4d1699ae 100644 --- a/plugins/MirandaG15/src/stdafx.cpp +++ b/plugins/MirandaG15/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/MobileState/src/stdafx.cpp b/plugins/MobileState/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/MobileState/src/stdafx.cpp +++ b/plugins/MobileState/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/ModernOpt/src/commonheaders.h b/plugins/ModernOpt/src/commonheaders.h index 2e01b9f39e..f86a02b766 100644 --- a/plugins/ModernOpt/src/commonheaders.h +++ b/plugins/ModernOpt/src/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2008 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/ModernOpt/src/modernopt.cpp b/plugins/ModernOpt/src/modernopt.cpp index 67cdccbfcd..d1382fb30b 100644 --- a/plugins/ModernOpt/src/modernopt.cpp +++ b/plugins/ModernOpt/src/modernopt.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-07 Miranda ICQ/IM project,
Copyright 2007 Artem Shpynov
-Copyright 2000-2007 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -693,4 +694,3 @@ void UnloadModernOptsModule() hwndModernOpt = 0;
}
}
-
diff --git a/plugins/ModernOpt/src/modernopt.h b/plugins/ModernOpt/src/modernopt.h index 2d4f8f8791..d8df528c8f 100644 --- a/plugins/ModernOpt/src/modernopt.h +++ b/plugins/ModernOpt/src/modernopt.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2007 Artem Shpynov
-Copyright 2000-2007 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-07 Miranda ICQ/IM project,
+Copyright (c) 2007 Artem Shpynov
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/ModernOpt/src/mopt_home.cpp b/plugins/ModernOpt/src/mopt_home.cpp index df3c08d022..6b79726693 100644 --- a/plugins/ModernOpt/src/mopt_home.cpp +++ b/plugins/ModernOpt/src/mopt_home.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2007 Artem Shpynov
-Copyright 2000-2007 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-07 Miranda ICQ/IM project,
+Copyright (c) 2007 Artem Shpynov
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -43,7 +44,7 @@ INT_PTR CALLBACK ModernOptHome_DlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L MDescButton_SetTitle(hwndCtrl, TranslateTS(g_ModernOptPages[i].lpzTitle));
MDescButton_SetDescription(hwndCtrl, TranslateTS(g_ModernOptPages[i].lpzDescription));
DestroyIcon(hIcon);
- }
+ }
else ShowWindow(hwndCtrl, SW_HIDE);
} }
diff --git a/plugins/ModernOpt/src/mopt_ignore.cpp b/plugins/ModernOpt/src/mopt_ignore.cpp index 249ad5ae61..19d6df1a7b 100644 --- a/plugins/ModernOpt/src/mopt_ignore.cpp +++ b/plugins/ModernOpt/src/mopt_ignore.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2007 Artem Shpynov
-Copyright 2000-2007 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-07 Miranda ICQ/IM project,
+Copyright (c) 2007 Artem Shpynov
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/ModernOpt/src/mopt_selector.cpp b/plugins/ModernOpt/src/mopt_selector.cpp index 515e23f8f6..7ac405b294 100644 --- a/plugins/ModernOpt/src/mopt_selector.cpp +++ b/plugins/ModernOpt/src/mopt_selector.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2007 Artem Shpynov
-Copyright 2000-2007 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-07 Miranda ICQ/IM project,
+Copyright (c) 2007 Artem Shpynov
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -154,14 +155,14 @@ static void BuildSkinList(HWND hwndList, TCHAR *szExt, int nExtLength = -1, bool SetCurrentDirectory(ffd.cFileName);
BuildSkinList(hwndList, szExt, nExtLength, false);
SetCurrentDirectory(_T(".."));
- }
+ }
else {
if (CheckExt(ffd.cFileName, szExt, nExtLength)) {
TSkinListItem *dat = new TSkinListItem(ffd.cFileName);
DWORD dwItem = SendMessage(hwndList, LB_ADDSTRING, 0, (LPARAM)ffd.cFileName);
SendMessage(hwndList, LB_SETITEMDATA, dwItem, (LPARAM)dat);
} }
- }
+ }
while (FindNextFile(h, &ffd));
FindClose(h);
}
@@ -294,7 +295,7 @@ INT_PTR CALLBACK ModernOptSelector_DlgProc(HWND hwndDlg, UINT msg, WPARAM wPara FillRect(lps->hDC, &lps->rcItem, GetSysColorBrush(COLOR_HIGHLIGHT));
clBack = GetSysColor(COLOR_HIGHLIGHT);
clLine1 = GetSysColor(COLOR_HIGHLIGHTTEXT);
- }
+ }
else {
FillRect(lps->hDC, &lps->rcItem, GetSysColorBrush(COLOR_WINDOW));
clBack = GetSysColor(COLOR_WINDOW);
@@ -318,7 +319,7 @@ INT_PTR CALLBACK ModernOptSelector_DlgProc(HWND hwndDlg, UINT msg, WPARAM wPara DrawIconEx(lps->hDC, lps->rcItem.left, (lps->rcItem.top+lps->rcItem.bottom-cyIcon)/2,
LoadSkinnedIcon(SKINICON_OTHER_EMPTYBLOB),
cxIcon, cyIcon, 0, NULL, DI_NORMAL);
- }
+ }
else {
DrawIconEx(lps->hDC, lps->rcItem.left, (lps->rcItem.top+lps->rcItem.bottom-cyIcon)/2,
LoadSkinnedIcon(SKINICON_OTHER_SMALLDOT),
@@ -334,7 +335,7 @@ INT_PTR CALLBACK ModernOptSelector_DlgProc(HWND hwndDlg, UINT msg, WPARAM wPara SetTextColor(lps->hDC, clLine2);
DrawText(lps->hDC, dat->path, -1, &lps->rcItem, DT_LEFT|DT_NOPREFIX|DT_SINGLELINE|DT_PATH_ELLIPSIS|DT_BOTTOM);
- }
+ }
else if (lps->CtlID == IDC_PREVIEW1) {
int idx = SendDlgItemMessage(hwndDlg, IDC_SKINLIST, LB_GETCURSEL, 0, 0);
@@ -343,7 +344,7 @@ INT_PTR CALLBACK ModernOptSelector_DlgProc(HWND hwndDlg, UINT msg, WPARAM wPara TSkinListItem *dat = (TSkinListItem *)SendDlgItemMessage(hwndDlg, IDC_SKINLIST, LB_GETITEMDATA, idx, 0);
CreatePreview(sd, dat->filename, lps);
//sttPreviewSkin(obj, dat->filename, lps);
- }
+ }
else CreatePreview(sd, NULL, lps);
}
@@ -351,7 +352,7 @@ INT_PTR CALLBACK ModernOptSelector_DlgProc(HWND hwndDlg, UINT msg, WPARAM wPara HDC hdc = CreateCompatibleDC(lps->hDC);
SelectObject(hdc, sd->hbmpPreview);
BitBlt(lps->hDC,
- lps->rcItem.left, lps->rcItem.top,
+ lps->rcItem.left, lps->rcItem.top,
lps->rcItem.right - lps->rcItem.left, lps->rcItem.bottom - lps->rcItem.top,
hdc, 0, 0, SRCCOPY);
DeleteDC(hdc);
diff --git a/plugins/ModernOpt/src/stdafx.cpp b/plugins/ModernOpt/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/ModernOpt/src/stdafx.cpp +++ b/plugins/ModernOpt/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/MsgPopup/src/stdafx.cpp b/plugins/MsgPopup/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/MsgPopup/src/stdafx.cpp +++ b/plugins/MsgPopup/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Msg_Export/src/Version.h b/plugins/Msg_Export/src/Version.h index 32d6814363..c6dc6aef08 100644 --- a/plugins/Msg_Export/src/Version.h +++ b/plugins/Msg_Export/src/Version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Kennet Nielsen, mod by ring0"
#define __AUTHOREMAIL "Kennet_N@ofir.dk"
#define __AUTHORWEB "http://miranda-ng.org/p/Msg_Export/"
-#define __COPYRIGHT "© 2002 Kennet Nielsen, © 2012-2013 Miranda NG Team"
+#define __COPYRIGHT "© 2002 Kennet Nielsen, © 2012-14 Miranda NG Team"
diff --git a/plugins/Msg_Export/src/stdafx.cpp b/plugins/Msg_Export/src/stdafx.cpp index 3d867e2374..a76f1d2900 100644 --- a/plugins/Msg_Export/src/stdafx.cpp +++ b/plugins/Msg_Export/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/MyDetails/src/stdafx.cpp b/plugins/MyDetails/src/stdafx.cpp index 550c908371..3e55ac0306 100644 --- a/plugins/MyDetails/src/stdafx.cpp +++ b/plugins/MyDetails/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/NewEventNotify/src/stdafx.cpp b/plugins/NewEventNotify/src/stdafx.cpp index 74df2166b3..df6871a9a3 100644 --- a/plugins/NewEventNotify/src/stdafx.cpp +++ b/plugins/NewEventNotify/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/NewXstatusNotify/src/stdafx.cpp b/plugins/NewXstatusNotify/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/NewXstatusNotify/src/stdafx.cpp +++ b/plugins/NewXstatusNotify/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/New_GPG/src/stdafx.cpp b/plugins/New_GPG/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/New_GPG/src/stdafx.cpp +++ b/plugins/New_GPG/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/NewsAggregator/Src/Stdafx.cpp b/plugins/NewsAggregator/Src/Stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/NewsAggregator/Src/Stdafx.cpp +++ b/plugins/NewsAggregator/Src/Stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/NoHistory/src/stdafx.cpp b/plugins/NoHistory/src/stdafx.cpp index eb7b9eba63..f37cc2da23 100644 --- a/plugins/NoHistory/src/stdafx.cpp +++ b/plugins/NoHistory/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Non-IM Contact/src/stdafx.cpp b/plugins/Non-IM Contact/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/Non-IM Contact/src/stdafx.cpp +++ b/plugins/Non-IM Contact/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/NotesAndReminders/src/stdafx.cpp b/plugins/NotesAndReminders/src/stdafx.cpp index 756d2802ce..53a6e6120d 100644 --- a/plugins/NotesAndReminders/src/stdafx.cpp +++ b/plugins/NotesAndReminders/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/NotifyAnything/src/stdafx.cpp b/plugins/NotifyAnything/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/NotifyAnything/src/stdafx.cpp +++ b/plugins/NotifyAnything/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Nudge/src/stdafx.cpp b/plugins/Nudge/src/stdafx.cpp index 48d92d3d56..5304ea985c 100644 --- a/plugins/Nudge/src/stdafx.cpp +++ b/plugins/Nudge/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/OpenFolder/src/stdafx.cpp b/plugins/OpenFolder/src/stdafx.cpp index fb0f05ab49..877df6d40a 100644 --- a/plugins/OpenFolder/src/stdafx.cpp +++ b/plugins/OpenFolder/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/PackUpdater/Src/stdafx.cpp b/plugins/PackUpdater/Src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/PackUpdater/Src/stdafx.cpp +++ b/plugins/PackUpdater/Src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/PasteIt/src/stdafx.cpp b/plugins/PasteIt/src/stdafx.cpp index 1ddfafbbbd..88ac2c2369 100644 --- a/plugins/PasteIt/src/stdafx.cpp +++ b/plugins/PasteIt/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Ping/src/stdafx.cpp b/plugins/Ping/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/Ping/src/stdafx.cpp +++ b/plugins/Ping/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/PluginUpdater/src/stdafx.cpp b/plugins/PluginUpdater/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/PluginUpdater/src/stdafx.cpp +++ b/plugins/PluginUpdater/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/stdafx.cpp b/plugins/Popup/src/stdafx.cpp index 48d92d3d56..5304ea985c 100644 --- a/plugins/Popup/src/stdafx.cpp +++ b/plugins/Popup/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/ProfileManager/src/stdafx.cpp b/plugins/ProfileManager/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/ProfileManager/src/stdafx.cpp +++ b/plugins/ProfileManager/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/QuickContacts/src/stdafx.cpp b/plugins/QuickContacts/src/stdafx.cpp index 550c908371..3e55ac0306 100644 --- a/plugins/QuickContacts/src/stdafx.cpp +++ b/plugins/QuickContacts/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/QuickMessages/src/stdafx.cpp b/plugins/QuickMessages/src/stdafx.cpp index bf6c2c9701..630190a67d 100644 --- a/plugins/QuickMessages/src/stdafx.cpp +++ b/plugins/QuickMessages/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/QuickReplies/src/stdafx.cpp b/plugins/QuickReplies/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/QuickReplies/src/stdafx.cpp +++ b/plugins/QuickReplies/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Quotes/src/stdafx.cpp b/plugins/Quotes/src/stdafx.cpp index 54dddf84b3..26e9e3e387 100644 --- a/plugins/Quotes/src/stdafx.cpp +++ b/plugins/Quotes/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Rate/src/stdafx.cpp b/plugins/Rate/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/Rate/src/stdafx.cpp +++ b/plugins/Rate/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/RecentContacts/src/stdafx.cpp b/plugins/RecentContacts/src/stdafx.cpp index 654afcbedf..75749fcc6d 100644 --- a/plugins/RecentContacts/src/stdafx.cpp +++ b/plugins/RecentContacts/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Restart/src/stdafx.cpp b/plugins/Restart/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/Restart/src/stdafx.cpp +++ b/plugins/Restart/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/SMS/src/stdafx.cpp b/plugins/SMS/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/SMS/src/stdafx.cpp +++ b/plugins/SMS/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Scriver/src/Version.h b/plugins/Scriver/src/Version.h index 3f1910d128..061117ee47 100644 --- a/plugins/Scriver/src/Version.h +++ b/plugins/Scriver/src/Version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG Development Team"
#define __AUTHOREMAIL "the_leech@users.berlios.de"
#define __AUTHORWEB "http://miranda-ng.org/p/Scriver/"
-#define __COPYRIGHT "© 2000-2012 Miranda IM Project, 2012-2013 Miranda NG Project"
+#define __COPYRIGHT "© 2000-2012 Miranda IM Project, 2012-14 Miranda NG project"
diff --git a/plugins/Scriver/src/cmdlist.cpp b/plugins/Scriver/src/cmdlist.cpp index 85297d0430..bac33bd1b8 100644 --- a/plugins/Scriver/src/cmdlist.cpp +++ b/plugins/Scriver/src/cmdlist.cpp @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2009 Miranda ICQ/IM project,
+Copyright (c) 2000-09 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/commonheaders.h b/plugins/Scriver/src/commonheaders.h index 3f4ebf43e2..61290a8782 100644 --- a/plugins/Scriver/src/commonheaders.h +++ b/plugins/Scriver/src/commonheaders.h @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2012 Miranda ICQ/IM project,
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp index 6db8274071..deb259b09f 100644 --- a/plugins/Scriver/src/globals.cpp +++ b/plugins/Scriver/src/globals.cpp @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2012 Miranda ICQ/IM project,
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/globals.h b/plugins/Scriver/src/globals.h index db2b7c512e..17d542d110 100644 --- a/plugins/Scriver/src/globals.h +++ b/plugins/Scriver/src/globals.h @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2012 Miranda ICQ/IM project,
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/infobar.cpp b/plugins/Scriver/src/infobar.cpp index 79c83e2e94..a7ce5bfa30 100644 --- a/plugins/Scriver/src/infobar.cpp +++ b/plugins/Scriver/src/infobar.cpp @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2012 Miranda ICQ/IM project,
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/infobar.h b/plugins/Scriver/src/infobar.h index 42580093f0..4b81334844 100644 --- a/plugins/Scriver/src/infobar.h +++ b/plugins/Scriver/src/infobar.h @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2009 Miranda ICQ/IM project,
+Copyright (c) 2000-09 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/input.cpp b/plugins/Scriver/src/input.cpp index f579ce24c3..20042befcd 100644 --- a/plugins/Scriver/src/input.cpp +++ b/plugins/Scriver/src/input.cpp @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2012 Miranda ICQ/IM project,
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/input.h b/plugins/Scriver/src/input.h index 5cff9ba89d..7d4e8313e2 100644 --- a/plugins/Scriver/src/input.h +++ b/plugins/Scriver/src/input.h @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2009 Miranda ICQ/IM project,
+Copyright (c) 2000-09 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 42e3ca6ec6..82b7cbc47d 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2012 Miranda ICQ/IM project,
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp index bb34675d3f..86a0061116 100644 --- a/plugins/Scriver/src/msglog.cpp +++ b/plugins/Scriver/src/msglog.cpp @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2012 Miranda ICQ/IM project,
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index d0a6fa9f76..b5413480ce 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2012 Miranda ICQ/IM project,
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index 7b659fd364..2cd0c51bf3 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2012 Miranda ICQ/IM project,
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h index 74004a7a91..39c8f53331 100644 --- a/plugins/Scriver/src/msgs.h +++ b/plugins/Scriver/src/msgs.h @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2012 Miranda ICQ/IM project,
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/msgtimedout.cpp b/plugins/Scriver/src/msgtimedout.cpp index a1546a6b0d..2837713e39 100644 --- a/plugins/Scriver/src/msgtimedout.cpp +++ b/plugins/Scriver/src/msgtimedout.cpp @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2009 Miranda ICQ/IM project,
+Copyright (c) 2000-09 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/msgwindow.cpp b/plugins/Scriver/src/msgwindow.cpp index 3261e4f48d..f3d37b9670 100644 --- a/plugins/Scriver/src/msgwindow.cpp +++ b/plugins/Scriver/src/msgwindow.cpp @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2009 Miranda ICQ/IM project,
+Copyright (c) 2000-09 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/msgwindow.h b/plugins/Scriver/src/msgwindow.h index 3d560550e0..d0c861bcfc 100644 --- a/plugins/Scriver/src/msgwindow.h +++ b/plugins/Scriver/src/msgwindow.h @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2009 Miranda ICQ/IM project,
+Copyright (c) 2000-09 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/richutil.h b/plugins/Scriver/src/richutil.h index f256085b69..797df9fd19 100644 --- a/plugins/Scriver/src/richutil.h +++ b/plugins/Scriver/src/richutil.h @@ -1,7 +1,7 @@ /*
SRMM
-Copyright 2000-2009 Miranda ICQ/IM project,
+Copyright (c) 2000-09 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/sendqueue.cpp b/plugins/Scriver/src/sendqueue.cpp index 0022478912..b77fc7a741 100644 --- a/plugins/Scriver/src/sendqueue.cpp +++ b/plugins/Scriver/src/sendqueue.cpp @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2009 Miranda ICQ/IM project,
+Copyright (c) 2000-09 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/sendqueue.h b/plugins/Scriver/src/sendqueue.h index b340a78362..7d8955648a 100644 --- a/plugins/Scriver/src/sendqueue.h +++ b/plugins/Scriver/src/sendqueue.h @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2009 Miranda ICQ/IM project,
+Copyright (c) 2000-09 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/srmm.cpp b/plugins/Scriver/src/srmm.cpp index 1bc3f59dff..2bfa95c935 100644 --- a/plugins/Scriver/src/srmm.cpp +++ b/plugins/Scriver/src/srmm.cpp @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2012 Miranda ICQ/IM project,
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/statusicon.cpp b/plugins/Scriver/src/statusicon.cpp index c10c0b0611..f9c3d02936 100644 --- a/plugins/Scriver/src/statusicon.cpp +++ b/plugins/Scriver/src/statusicon.cpp @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2009 Miranda ICQ/IM project,
+Copyright (c) 2000-09 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/statusicon.h b/plugins/Scriver/src/statusicon.h index c05cbd7ab8..7148a292c8 100644 --- a/plugins/Scriver/src/statusicon.h +++ b/plugins/Scriver/src/statusicon.h @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2009 Miranda ICQ/IM project,
+Copyright (c) 2000-09 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/stdafx.cpp b/plugins/Scriver/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/Scriver/src/stdafx.cpp +++ b/plugins/Scriver/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Scriver/src/utils.cpp b/plugins/Scriver/src/utils.cpp index 3ef388b7f8..37e3f6f8b6 100644 --- a/plugins/Scriver/src/utils.cpp +++ b/plugins/Scriver/src/utils.cpp @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2012 Miranda ICQ/IM project,
+Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Scriver/src/utils.h b/plugins/Scriver/src/utils.h index d9cb24d4be..dc741c42ab 100644 --- a/plugins/Scriver/src/utils.h +++ b/plugins/Scriver/src/utils.h @@ -1,7 +1,7 @@ /*
Scriver
-Copyright 2000-2009 Miranda ICQ/IM project,
+Copyright (c) 2000-09 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/SecureIM/src/stdafx.cpp b/plugins/SecureIM/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/SecureIM/src/stdafx.cpp +++ b/plugins/SecureIM/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/SeenPlugin/src/stdafx.cpp b/plugins/SeenPlugin/src/stdafx.cpp index 442b92fcde..d36d640d92 100644 --- a/plugins/SeenPlugin/src/stdafx.cpp +++ b/plugins/SeenPlugin/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/SendScreenshotPlus/src/CSend.cpp b/plugins/SendScreenshotPlus/src/CSend.cpp index e7c1638360..8661fa0776 100644 --- a/plugins/SendScreenshotPlus/src/CSend.cpp +++ b/plugins/SendScreenshotPlus/src/CSend.cpp @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn diff --git a/plugins/SendScreenshotPlus/src/CSend.h b/plugins/SendScreenshotPlus/src/CSend.h index 9b491258d0..6e65252919 100644 --- a/plugins/SendScreenshotPlus/src/CSend.h +++ b/plugins/SendScreenshotPlus/src/CSend.h @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn diff --git a/plugins/SendScreenshotPlus/src/CSendEmail.cpp b/plugins/SendScreenshotPlus/src/CSendEmail.cpp index 79f848f68c..c7f216b454 100644 --- a/plugins/SendScreenshotPlus/src/CSendEmail.cpp +++ b/plugins/SendScreenshotPlus/src/CSendEmail.cpp @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn @@ -86,7 +88,7 @@ void CSendEmail::Send() { void CSendEmail::SendThread() { //This code based on SentTo.exe application. //The default mail client for Simple MAPI or MAPI calls is defined by the - //HKLM\Software\Clients\Mail::(default) registry value. + //HKLM\Software\Clients\Mail::(default) registry value. MapiFileDesc arrfileDesc[1]; @@ -212,4 +214,3 @@ void CSendEmail::SendThreadWrapper(void * Obj) { } //--------------------------------------------------------------------------- - diff --git a/plugins/SendScreenshotPlus/src/CSendEmail.h b/plugins/SendScreenshotPlus/src/CSendEmail.h index 4decd8bc77..35e2372fc9 100644 --- a/plugins/SendScreenshotPlus/src/CSendEmail.h +++ b/plugins/SendScreenshotPlus/src/CSendEmail.h @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2009 Miranda ICQ/IM project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-09 Miranda ICQ/IM project,
This file is part of Send Screenshot Plus, a Miranda IM plugin.
Copyright (c) 2010 Ing.U.Horn
diff --git a/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp index 6048da9c4b..1105cfea5d 100644 --- a/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp +++ b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2009 Miranda ICQ/IM project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-09 Miranda ICQ/IM project,
This file is part of Send Screenshot Plus, a Miranda IM plugin.
Copyright (c) 2010 Ing.U.Horn
@@ -46,11 +48,11 @@ CSendFTPFile::~CSendFTPFile(){ void CSendFTPFile::Send() {
/*********************************************************************************************
- * Send file (files) to the FTP server and copy file URL
+ * Send file (files) to the FTP server and copy file URL
* to message log or clipboard (according to plugin setting)
* wParam = (HANDLE)hContact
* lParam = (char *)filename
- * Filename format is same as GetOpenFileName (OPENFILENAME.lpstrFile) returns,
+ * Filename format is same as GetOpenFileName (OPENFILENAME.lpstrFile) returns,
* see http://msdn2.microsoft.com/en-us/library/ms646839.aspx
* Returns 0 on success or nonzero on failure
* if (!wParam || !lParam) return 1
@@ -89,4 +91,3 @@ void CSendFTPFile::SendThreadWrapper(void * Obj) { }
//---------------------------------------------------------------------------
-
diff --git a/plugins/SendScreenshotPlus/src/CSendFTPFile.h b/plugins/SendScreenshotPlus/src/CSendFTPFile.h index d9c890fd4d..9fa83e0481 100644 --- a/plugins/SendScreenshotPlus/src/CSendFTPFile.h +++ b/plugins/SendScreenshotPlus/src/CSendFTPFile.h @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2009 Miranda ICQ/IM project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-09 Miranda ICQ/IM project,
This file is part of Send Screenshot Plus, a Miranda IM plugin.
Copyright (c) 2010 Ing.U.Horn
diff --git a/plugins/SendScreenshotPlus/src/CSendFile.cpp b/plugins/SendScreenshotPlus/src/CSendFile.cpp index 7c06b7c866..34489fbe1d 100644 --- a/plugins/SendScreenshotPlus/src/CSendFile.cpp +++ b/plugins/SendScreenshotPlus/src/CSendFile.cpp @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2009 Miranda ICQ/IM project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-09 Miranda ICQ/IM project,
This file is part of Send Screenshot Plus, a Miranda IM plugin.
Copyright (c) 2010 Ing.U.Horn
diff --git a/plugins/SendScreenshotPlus/src/CSendFile.h b/plugins/SendScreenshotPlus/src/CSendFile.h index 27ab2a787f..1476c58c14 100644 --- a/plugins/SendScreenshotPlus/src/CSendFile.h +++ b/plugins/SendScreenshotPlus/src/CSendFile.h @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2009 Miranda ICQ/IM project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-09 Miranda ICQ/IM project,
This file is part of Send Screenshot Plus, a Miranda IM plugin.
Copyright (c) 2010 Ing.U.Horn
diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp index f89c12e74a..af3f4f277f 100644 --- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp +++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn @@ -132,4 +134,3 @@ INT_PTR CSendHTTPServer::MyCallService(const char *name, WPARAM wParam, LPARAM l }* / return g_MirCallService(name, wParam, lParam); }*/ - diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.h b/plugins/SendScreenshotPlus/src/CSendHTTPServer.h index b8740e0a2b..d8b2209aa0 100644 --- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.h +++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.h @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn diff --git a/plugins/SendScreenshotPlus/src/CSendImageShack.cpp b/plugins/SendScreenshotPlus/src/CSendImageShack.cpp index 72fb4795c6..54608e6d35 100644 --- a/plugins/SendScreenshotPlus/src/CSendImageShack.cpp +++ b/plugins/SendScreenshotPlus/src/CSendImageShack.cpp @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn @@ -85,7 +87,7 @@ void CSendImageShack::Send() { //nlhr.headers[x].szName = "Authorization"; //nlhr.headers[x].szValue = auth; //Basic base-64-authorization - //$header .= "Content-type: multipart/form-data; boundary=" . part::getBoundary() . "\r\n"; + //$header .= "Content-type: multipart/form-data; boundary=" . part::getBoundary() . "\r\n"; mir_snprintf(m_nlheader_ContentType, SIZEOF(m_nlheader_ContentType), "multipart/form-data; boundary=%s", m_MFDRboundary); m_nlhr.headers[m_nlhr.headersCount-1].szName = "Content-Type"; m_nlhr.headers[m_nlhr.headersCount-1].szValue = m_nlheader_ContentType; @@ -265,7 +267,7 @@ void CSendImageShack::AppendToData(const char *pszVal) { size_t lenVal = strlen(pszVal); size_t sizeNew = sizeof(char)*(m_nlhr.dataLength + lenVal + 1); m_nlhr.pData = (char*) mir_realloc(m_nlhr.pData, sizeNew); - + strcpy(m_nlhr.pData + sizeof(char)*m_nlhr.dataLength, pszVal); m_nlhr.pData[sizeNew-1] = 0; m_nlhr.dataLength = (int)sizeNew -1; @@ -281,4 +283,3 @@ const char * CSendImageShack::GetTagContent(char * pszSource, const char * pszTa if (e) *e = 0; return b; } - diff --git a/plugins/SendScreenshotPlus/src/CSendImageShack.h b/plugins/SendScreenshotPlus/src/CSendImageShack.h index c5077e437f..c7ee7e1e15 100644 --- a/plugins/SendScreenshotPlus/src/CSendImageShack.h +++ b/plugins/SendScreenshotPlus/src/CSendImageShack.h @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp index 9c07123015..3df0ba8f66 100644 --- a/plugins/SendScreenshotPlus/src/Main.cpp +++ b/plugins/SendScreenshotPlus/src/Main.cpp @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn @@ -107,7 +109,7 @@ extern "C" __declspec(dllexport) int Load(void) RegisterServices(); AddMenuItems(); - + //hotkey's HOTKEYDESC hkd={sizeof(hkd)}; hkd.pszName="Open SendSS+"; @@ -164,10 +166,10 @@ int hook_SystemPreShutdown(WPARAM wParam, LPARAM lParam) { TfrmAbout::Unload();//crashes if done from "Unload" because of dependencies TfrmMain::Unload();// " - + // Netlib unregister NetlibClose(); - + // uninitialize classes CtrlButtonUnloadModule(); return 0; diff --git a/plugins/SendScreenshotPlus/src/Main.h b/plugins/SendScreenshotPlus/src/Main.h index 5e18f59bc0..87276a9794 100644 --- a/plugins/SendScreenshotPlus/src/Main.h +++ b/plugins/SendScreenshotPlus/src/Main.h @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn diff --git a/plugins/SendScreenshotPlus/src/UAboutForm.cpp b/plugins/SendScreenshotPlus/src/UAboutForm.cpp index 5007deda1f..ce7eaadf74 100644 --- a/plugins/SendScreenshotPlus/src/UAboutForm.cpp +++ b/plugins/SendScreenshotPlus/src/UAboutForm.cpp @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn diff --git a/plugins/SendScreenshotPlus/src/UAboutForm.h b/plugins/SendScreenshotPlus/src/UAboutForm.h index 6b4187fb43..3f742da2d7 100644 --- a/plugins/SendScreenshotPlus/src/UAboutForm.h +++ b/plugins/SendScreenshotPlus/src/UAboutForm.h @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp index 4bfeaf224c..d7d058df1c 100644 --- a/plugins/SendScreenshotPlus/src/UMainForm.cpp +++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn @@ -47,7 +49,7 @@ INT_PTR CALLBACK TfrmMain::DlgProc_CaptureWindow(HWND hDlg, UINT uMsg, WPARAM wP SetDlgItemText(hDlg, ID_edtCaption, TranslateT("Drag&Drop the target on the desired window.")); TranslateDialogDefault(hDlg); break; - case WM_CTLCOLOREDIT: //ctrl is NOT read-only or disabled + case WM_CTLCOLOREDIT: //ctrl is NOT read-only or disabled case WM_CTLCOLORSTATIC: //ctrl is read-only or disabled // make the rectangle on the top white switch (GetWindowLongPtr((HWND)lParam, GWL_ID)) { @@ -217,7 +219,7 @@ void TfrmMain::wmInitdialog(WPARAM wParam, LPARAM lParam) { ImageList_AddIcon(m_himlTab, IcoLib_GetIcon(ICO_PLUG_SSWINDOW2)); } - //create the tab control. + //create the tab control. { TAB_INFO itab; RECT rcClient, rcTab; @@ -230,10 +232,10 @@ void TfrmMain::wmInitdialog(WPARAM wParam, LPARAM lParam) { GetWindowRect(m_hwndTab, &rcTab); GetWindowRect(m_hWnd, &rcClient); - + TabCtrl_SetImageList(m_hwndTab, m_himlTab); - // Add a tab for each of the three child dialog boxes. + // Add a tab for each of the three child dialog boxes. itab.tcih.mask = TCIF_PARAM|TCIF_TEXT|TCIF_IMAGE; itab.tcih.pszText = TranslateT("Window"); @@ -386,11 +388,11 @@ void TfrmMain::wmCommand(WPARAM wParam, LPARAM lParam) { case ID_chkEditor: m_opt_chkEditor = (BYTE)Button_GetCheck((HWND)lParam); break; - + case ID_bvlTarget: if(m_opt_tabCapture==0) SetTimer(m_hWnd,ID_bvlTarget,BUTTON_POLLDELAY,NULL); break; - + case ID_btnAbout: TfrmMain::btnAboutClick(); break; @@ -677,7 +679,7 @@ void TfrmMain::UMevent(WPARAM wParam, LPARAM lParam) { TfrmMain::TfrmMain() { /* m_opt_XXX */ m_bOnExitSave = TRUE; - + m_hWnd = NULL; m_hContact = NULL; m_bDeleteAfterSend=m_bFormAbout=m_bFormEdit=false; @@ -687,7 +689,7 @@ TfrmMain::TfrmMain() { m_Screenshot = NULL; /* m_AlphaColor */ m_cSend = NULL; - + m_MonitorCount = MonitorInfoEnum(m_Monitors, m_VirtualScreen); m_Monitors = NULL; /* m_opt_XXX */ LoadOptions(); @@ -1046,11 +1048,11 @@ INT_PTR TfrmMain::SaveScreenshot(FIBITMAP* dib) { TCHAR pszFormat[6]; ComboBox_GetText(hwndCombo, pszFormat, 6); if(ret && (_tcsicmp (pszFormat,_T("png")) != 0)) { - + fif = FIP->FI_GetFIFFromFilenameU(ret); dib_new = FIP->FI_LoadU(fif, ret,0); - - + + if(dib_new) { DeleteFile(ret); mir_freeAndNil(ret); @@ -1073,7 +1075,7 @@ INT_PTR TfrmMain::SaveScreenshot(FIBITMAP* dib) { mir_free(pszFileDesc); mir_tcsadd(m_pszFileDesc, _T("")); } - + if(m_cSend) { mir_freeAndNil(m_cSend->m_pszFile); m_cSend->m_pszFile=mir_tstrdup(m_pszFile); mir_freeAndNil(m_cSend->m_pszFileDesc); m_cSend->m_pszFileDesc=mir_tstrdup(m_pszFileDesc); diff --git a/plugins/SendScreenshotPlus/src/UMainForm.h b/plugins/SendScreenshotPlus/src/UMainForm.h index a743e81c90..cf6c827c4e 100644 --- a/plugins/SendScreenshotPlus/src/UMainForm.h +++ b/plugins/SendScreenshotPlus/src/UMainForm.h @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn @@ -46,9 +48,9 @@ extern FI_INTERFACE *FIP; typedef struct MyTabData { TCITEMHEADER tcih; - HWND hwndMain; //main window - HWND hwndTab; //tab control - HWND hwndTabPage; //current child dialog box + HWND hwndMain; //main window + HWND hwndTab; //tab control + HWND hwndTabPage; //current child dialog box }TAB_INFO; //--------------------------------------------------------------------------- @@ -57,7 +59,7 @@ class TfrmMain{ // Deklaration Standardkonstruktor/Standarddestructor TfrmMain(); ~TfrmMain(); - + BYTE m_opt_tabCapture; //capure tab page BYTE m_opt_btnDesc; //TCheckBox *chkDesc; BYTE m_opt_cboxDesktop; //TRadioButton *rbtnDesktop; @@ -65,7 +67,7 @@ class TfrmMain{ BYTE m_opt_chkTimed; //TCheckBox *chkTimed; BYTE m_opt_cboxSendBy; //TComboBox *cboxSendBy; bool m_bOnExitSave; - + static void Unload(); void Init(LPTSTR DestFolder, HANDLE Contact); void Close(){SendMessage(m_hWnd,WM_CLOSE,0,0);} @@ -74,7 +76,7 @@ class TfrmMain{ void SetTargetWindow(HWND hwnd=NULL); void btnCaptureClick(); void cboxSendByChange(); - + private: HWND m_hWnd; HANDLE m_hContact; @@ -88,7 +90,7 @@ class TfrmMain{ FIBITMAP* m_Screenshot;//Graphics::TBitmap *Screenshot; RGBQUAD m_AlphaColor; CSend* m_cSend; - + void chkTimedClick(); void imgTargetMouseUp(); void btnAboutClick(); @@ -100,12 +102,12 @@ class TfrmMain{ void FormClose(); static void edtSizeUpdate(HWND hWnd, BOOL ClientArea, HWND hTarget, UINT Ctrl); static void edtSizeUpdate(RECT rect, HWND hTarget, UINT Ctrl); - + protected: size_t m_MonitorCount; MONITORINFOEX* m_Monitors; RECT m_VirtualScreen; - + BYTE m_opt_chkOpenAgain; //TCheckBox *chkOpenAgain; BYTE m_opt_chkClientArea; //TCheckBox *chkClientArea; BYTE m_opt_edtQuality; //TLabeledEdit *edtQuality; @@ -116,20 +118,20 @@ class TfrmMain{ HWND m_hwndTab; //TabControl handle HWND m_hwndTabPage; //TabControl activ page handle HIMAGELIST m_himlTab; //TabControl imagelist - + typedef std::map<HWND, TfrmMain *> CHandleMapping; static CHandleMapping _HandleMapping; static INT_PTR CALLBACK DlgTfrmMain(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); - + void wmInitdialog(WPARAM wParam, LPARAM lParam); void wmCommand(WPARAM wParam, LPARAM lParam); void wmClose(WPARAM wParam, LPARAM lParam); void wmNotify(WPARAM wParam, LPARAM lParam); void wmTimer(WPARAM wParam, LPARAM lParam); - + void UMevent(WPARAM wParam, LPARAM lParam); void UMClosing(WPARAM wParam, LPARAM lParam); - + static INT_PTR CALLBACK DlgProc_CaptureWindow (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static INT_PTR CALLBACK DlgProc_CaptureDesktop(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); // LRESULT CALLBACK DlgProc_UseLastFile (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); diff --git a/plugins/SendScreenshotPlus/src/Utils.cpp b/plugins/SendScreenshotPlus/src/Utils.cpp index de98ff1e6a..a8c6ce22d0 100644 --- a/plugins/SendScreenshotPlus/src/Utils.cpp +++ b/plugins/SendScreenshotPlus/src/Utils.cpp @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn @@ -159,7 +161,7 @@ FIBITMAP* CaptureScreen (HDC hDC,SIZE size,HWND hCapture){ BitBlt(hMemDC,0,0,size.cx,size.cy,hScrDC,0,0,CAPTUREBLT|SRCCOPY); } dib = FIP->FI_CreateDIBFromHBITMAP(hBitmap); - + if(hCapture){ //alpha channel from window is always wrong, //coz GDI do not draw all in alpha mode. @@ -316,7 +318,7 @@ LPTSTR SaveImage(FREE_IMAGE_FORMAT fif, FIBITMAP* dib, LPTSTR pszFilename, LPTST } ret = FIP->FI_SaveU(fif, dib, pszFile, flag); - + mir_free(FileExt); diff --git a/plugins/SendScreenshotPlus/src/Utils.h b/plugins/SendScreenshotPlus/src/Utils.h index 70704eb78a..7270178153 100644 --- a/plugins/SendScreenshotPlus/src/Utils.h +++ b/plugins/SendScreenshotPlus/src/Utils.h @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn diff --git a/plugins/SendScreenshotPlus/src/ctrl_button.h b/plugins/SendScreenshotPlus/src/ctrl_button.h index 03bb668aa8..5a4cb5bed5 100644 --- a/plugins/SendScreenshotPlus/src/ctrl_button.h +++ b/plugins/SendScreenshotPlus/src/ctrl_button.h @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, +all portions of this codebase are copyrighted to the people listed in contributors.txt. This program is free software; you can redistribute it and/or diff --git a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp index 14e1c4d7d9..b73d3d5fa7 100644 --- a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp +++ b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2009 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-09 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -32,13 +33,13 @@ MSGPOPUPDATA, *LPMSGPOPUPDATA; /**
* This helper function moves and resizes a dialog box's control element.
- *
+ *
* @param hDlg - the dialog box's window handle
* @param idCtrl - the identication number of the control to move
- * @param dx -´number of pixels to horizontal move the control
- * @param dy - number of pixels to vertical move the control
- * @param dw - number of pixels to horizontal resize the control
- * @param dh - number of pixels to vertical resize the control
+ * @param dx -´number of pixels to horizontal move the control
+ * @param dy - number of pixels to vertical move the control
+ * @param dw - number of pixels to horizontal resize the control
+ * @param dh - number of pixels to vertical resize the control
*
* @return nothing
**/
@@ -66,14 +67,14 @@ HICON MsgLoadIcon(LPMSGBOX pMsgBox) // load the desired status icon
switch (pMsgBox->uType & MB_ICONMASK)
{
-
+
// custom icon defined by caller function
case MB_ICON_OTHER:
{
hIcon = pMsgBox->hiMsg;
}
break;
-
+
// default windows icons
case MB_ICON_ERROR:
case MB_ICON_QUESTION:
@@ -96,7 +97,7 @@ HICON MsgLoadIcon(LPMSGBOX pMsgBox) /**
* This function fills a given POPUPACTION structure with the data of a given message id,
- * which is normally used by the message box. This is required to let the user interact
+ * which is normally used by the message box. This is required to let the user interact
* with a popup in the same way as with a normal message dialog box.
*
* @param pa - reference to a POPUPACTION structure to fill
@@ -148,7 +149,7 @@ void MakePopupAction(POPUPACTION &pa, INT id) pa.lchIcon = IcoLib_GetIcon(ICO_PLUG_CANCEL);
lstrcpyA(pa.lpzTitle, MODNAME"/No");
break;
-
+
case IDHELP:
pa.lchIcon = IcoLib_GetIcon(ICO_PLUG_CANCEL);
lstrcpyA(pa.lpzTitle, MODNAME"/Help");
@@ -203,12 +204,12 @@ INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) GetObject(hNormalFont, sizeof(lf), &lf);
lf.lfWeight = FW_BOLD;
hNormalFont = CreateFontIndirect(&lf);
-
+
// set infobar's textfont
SendDlgItemMessage(hDlg, TXT_NAME, WM_SETFONT, (WPARAM)hNormalFont, 0);
// set infobar's logo icon
- SendDlgItemMessage(hDlg, ICO_DLGLOGO, STM_SETIMAGE, IMAGE_ICON,
+ SendDlgItemMessage(hDlg, ICO_DLGLOGO, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)((pMsgBox->hiLogo) ? pMsgBox->hiLogo : IcoLib_GetIcon(ICO_DLG_DETAILS)));
// anable headerbar
@@ -220,7 +221,7 @@ INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) RECT rc;
GetClientRect(GetDlgItem(hDlg, TXT_NAME), &rc);
InfoBarHeight = rc.bottom;
-
+
if (pMsgBox->hiLogo)
{
SendMessage(hDlg, WM_SETICON, ICON_BIG, (LPARAM)pMsgBox->hiLogo);
@@ -255,9 +256,9 @@ INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) SelectObject(hDC, hNormalFont);
- for (rs = h = pMsgBox->ptszMsg, txtHeight = 0, txtWidth = 0; h; h++)
+ for (rs = h = pMsgBox->ptszMsg, txtHeight = 0, txtWidth = 0; h; h++)
{
- if (*h == '\n' || *h == '\0')
+ if (*h == '\n' || *h == '\0')
{
GetTextExtentPoint32(hDC, rs, h - rs, &ts);
if (ts.cx > txtWidth)
@@ -273,7 +274,7 @@ INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) }
}
ReleaseDC(hDlg, hDC);
-
+
// calc new dialog size
GetWindowRect(hDlg, &rcDlg);
GetWindowRect(GetDlgItem(hDlg, TXT_MESSAGE), &ws);
@@ -281,21 +282,21 @@ INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) needY = max(0, txtHeight - (ws.bottom - ws.top) + 5);
rcDlg.left -= needX/2; rcDlg.right += needX/2;
rcDlg.top -= (needY-InfoBarHeight)/2; rcDlg.bottom += (needY-InfoBarHeight)/2;
-
+
// resize dialog window
- MoveWindow(hDlg,
- rcDlg.left, rcDlg.top,
- rcDlg.right - rcDlg.left,
+ MoveWindow(hDlg,
+ rcDlg.left, rcDlg.top,
+ rcDlg.right - rcDlg.left,
rcDlg.bottom - rcDlg.top,
FALSE);
ClientToScreen(hDlg, &mpt);
- MoveCtrl(hDlg, STATIC_WHITERECT, -mpt.x, -mpt.y, needX, needY - InfoBarHeight);
- MoveCtrl(hDlg, TXT_NAME, -mpt.x, -mpt.y, needX, 0);
- MoveCtrl(hDlg, ICO_DLGLOGO, -mpt.x + needX, -mpt.y, 0, 0);
- MoveCtrl(hDlg, ICO_MSGDLG, -mpt.x, -mpt.y - InfoBarHeight, 0, 0);
- MoveCtrl(hDlg, TXT_MESSAGE, -mpt.x - icoWidth, -mpt.y - InfoBarHeight, needX, needY);
- MoveCtrl(hDlg, STATIC_LINE2, -mpt.x, -mpt.y + needY - InfoBarHeight, needX, 0);
+ MoveCtrl(hDlg, STATIC_WHITERECT, -mpt.x, -mpt.y, needX, needY - InfoBarHeight);
+ MoveCtrl(hDlg, TXT_NAME, -mpt.x, -mpt.y, needX, 0);
+ MoveCtrl(hDlg, ICO_DLGLOGO, -mpt.x + needX, -mpt.y, 0, 0);
+ MoveCtrl(hDlg, ICO_MSGDLG, -mpt.x, -mpt.y - InfoBarHeight, 0, 0);
+ MoveCtrl(hDlg, TXT_MESSAGE, -mpt.x - icoWidth, -mpt.y - InfoBarHeight, needX, needY);
+ MoveCtrl(hDlg, STATIC_LINE2, -mpt.x, -mpt.y + needY - InfoBarHeight, needX, 0);
//
// Do pushbutton positioning
@@ -316,7 +317,7 @@ INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) GetWindowRect(GetDlgItem(hDlg, IDCANCEL), &rcCancel);
OffsetRect(&rcCancel, -mpt.x, -mpt.y + needY - InfoBarHeight);
-
+
okWidth = rcOk.right - rcOk.left;
allWidth = rcAll.right - rcAll.left;
noneWidth = rcNone.right - rcNone.left;
@@ -432,7 +433,7 @@ INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) SetDlgItemText(hDlg, IDCANCEL, LPGENT("No"));
rcCancel.right = rcDlg.right - rcDlg.left - 10;
rcCancel.left = rcCancel.right - caWidth;
- rcNone.right = rcCancel.left - 5;
+ rcNone.right = rcCancel.left - 5;
rcNone.left = rcNone.right - noneWidth;
rcAll.right = rcNone.left - 5;
rcAll.left = rcAll.right - allWidth;
@@ -453,23 +454,23 @@ INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) }
}
// move ok button
- MoveWindow(GetDlgItem(hDlg, IDOK),
- rcOk.left, rcOk.top,
+ MoveWindow(GetDlgItem(hDlg, IDOK),
+ rcOk.left, rcOk.top,
rcOk.right - rcOk.left, rcOk.bottom - rcOk.top,
FALSE);
// move all button
- MoveWindow(GetDlgItem(hDlg, IDALL),
- rcAll.left, rcAll.top,
+ MoveWindow(GetDlgItem(hDlg, IDALL),
+ rcAll.left, rcAll.top,
rcAll.right - rcAll.left, rcAll.bottom - rcAll.top,
FALSE);
// move none button
- MoveWindow(GetDlgItem(hDlg, IDNONE),
- rcNone.left, rcNone.top,
+ MoveWindow(GetDlgItem(hDlg, IDNONE),
+ rcNone.left, rcNone.top,
rcNone.right - rcNone.left, rcNone.bottom - rcNone.top,
FALSE);
// move cancel button
- MoveWindow(GetDlgItem(hDlg, IDCANCEL),
- rcCancel.left, rcCancel.top,
+ MoveWindow(GetDlgItem(hDlg, IDCANCEL),
+ rcCancel.left, rcCancel.top,
rcCancel.right - rcCancel.left, rcCancel.bottom - rcCancel.top,
FALSE);
} // end* Do pushbutton positioning
@@ -489,7 +490,7 @@ INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_CTLCOLORSTATIC:
{
- switch (GetWindowLong((HWND)lParam, GWL_ID))
+ switch (GetWindowLong((HWND)lParam, GWL_ID))
{
case STATIC_WHITERECT:
case ICO_DLGLOGO:
@@ -506,7 +507,7 @@ INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_COMMAND:
{
- switch (LOWORD(wParam))
+ switch (LOWORD(wParam))
{
case IDOK:
EndDialog(hDlg, retOk);
@@ -688,7 +689,7 @@ LRESULT CALLBACK PopupProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) }
/**
- * This is the service function for external plugins to use the nice messagebox
+ * This is the service function for external plugins to use the nice messagebox
*
* @param wParam - HANDLE hContact which can display an avatar for popups
* @param lParam - MSGBOX structure holding parameters
@@ -702,7 +703,7 @@ INT_PTR MsgBoxService(WPARAM wParam, LPARAM lParam) LPMSGBOX pMsgBox = (LPMSGBOX)lParam;
// check input
- if (PtrIsValid(pMsgBox) && pMsgBox->cbSize == sizeof(MSGBOX))
+ if (PtrIsValid(pMsgBox) && pMsgBox->cbSize == sizeof(MSGBOX))
{
// Shall the MessageBox displayed as popup?
if (!(pMsgBox->uType & (MB_INFOBAR|MB_NOPOPUP)) && // message box can be a popup?
@@ -724,8 +725,8 @@ INT_PTR MsgBoxService(WPARAM wParam, LPARAM lParam) /**
* name: MsgBox
- * desc: calls a messagebox
- * param:
+ * desc: calls a messagebox
+ * param:
**/
INT_PTR MsgBox(HWND hParent, UINT uType, LPTSTR pszTitle, LPTSTR pszInfo, LPTSTR pszFormat, ...)
{
@@ -750,8 +751,8 @@ INT_PTR MsgBox(HWND hParent, UINT uType, LPTSTR pszTitle, LPTSTR pszInfo, LPTSTR /**
* name: MsgErr
- * desc: calls a messagebox
- * param:
+ * desc: calls a messagebox
+ * param:
**/
INT_PTR MsgErr(HWND hParent, LPCTSTR pszFormat, ...)
{
diff --git a/plugins/SendScreenshotPlus/src/dlg_msgbox.h b/plugins/SendScreenshotPlus/src/dlg_msgbox.h index f878f82adc..ee743f4c3c 100644 --- a/plugins/SendScreenshotPlus/src/dlg_msgbox.h +++ b/plugins/SendScreenshotPlus/src/dlg_msgbox.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2009 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-09 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -73,7 +74,7 @@ flags #define MB_NOPOPUP 0x00000200L
#define MB_CUSTOMCOLOR 0x00000300L
-typedef struct _MSGBOX
+typedef struct _MSGBOX
{
UINT cbSize; // size of this structure
UINT uType; // parameters
@@ -83,7 +84,7 @@ typedef struct _MSGBOX LPTSTR ptszInfoText;
LPTSTR ptszMsg;
HWND hParent; // parent window for the messagebox
- COLORREF colorBack; // valid if MB_CUSTOMCOLOR is set
+ COLORREF colorBack; // valid if MB_CUSTOMCOLOR is set
COLORREF colorText; // valid if MB_CUSTOMCOLOR is set
} MSGBOX, *LPMSGBOX;
diff --git a/plugins/SendScreenshotPlus/src/global.h b/plugins/SendScreenshotPlus/src/global.h index b1c63cbc1b..9836d32e11 100644 --- a/plugins/SendScreenshotPlus/src/global.h +++ b/plugins/SendScreenshotPlus/src/global.h @@ -1,6 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, + +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn diff --git a/plugins/SendScreenshotPlus/src/mir_icolib.cpp b/plugins/SendScreenshotPlus/src/mir_icolib.cpp index 6302d6b86f..b7f3a48ea8 100644 --- a/plugins/SendScreenshotPlus/src/mir_icolib.cpp +++ b/plugins/SendScreenshotPlus/src/mir_icolib.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2009 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-09 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -38,7 +39,7 @@ struct WORD idResource;
BYTE size;
}
-static icoDesc[] =
+static icoDesc[] =
{
// common
{ ICO_PLUG_SSWINDOW1, LPGEN("Screenshot Icon1"), SECT_COMMON, IDI_PLUG_MAIN, -1 },
@@ -83,8 +84,8 @@ HICON IcoLib_GetIcon(LPCSTR pszIcon, bool big) /**
* This function manually registers a single icon from the default icon library.
*
- * @param szIconID - This is the uniquely identifying string for an icon.
- * This string is the setting name in the database and should
+ * @param szIconID - This is the uniquely identifying string for an icon.
+ * This string is the setting name in the database and should
* only use ASCII characters.
* @param szDescription - This is the description displayed in the options dialog.
* @param szSection - This is the subsection, where the icon is organized in the options dialog.
@@ -163,10 +164,9 @@ VOID IcoLib_LoadModule() szPluginFile = _T("Plugins\\")_T(__FILENAME);
// load default icon if required
- ghDefIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_PLUG_DEFAULT), IMAGE_ICON,
+ ghDefIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_PLUG_DEFAULT), IMAGE_ICON,
GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0);
- for (i = 0; i < SIZEOF(icoDesc); i++)
+ for (i = 0; i < SIZEOF(icoDesc); i++)
IcoLib_RegisterIconHandleEx(icoDesc[i].pszName, icoDesc[i].pszDesc, icoDesc[i].pszSection, szPluginFile, icoDesc[i].idResource, icoDesc[i].size, ghDefIcon);
}
-
diff --git a/plugins/SendScreenshotPlus/src/mir_icolib.h b/plugins/SendScreenshotPlus/src/mir_icolib.h index 05e5af019f..a75941519f 100644 --- a/plugins/SendScreenshotPlus/src/mir_icolib.h +++ b/plugins/SendScreenshotPlus/src/mir_icolib.h @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-09 Miranda ICQ/IM project, +all portions of this codebase are copyrighted to the people listed in contributors.txt. This program is free software; you can redistribute it and/or @@ -55,7 +56,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define ICO_DLG_DETAILS MODNAME"_dlg_details" -/*typedef struct TIconCtrl +/*typedef struct TIconCtrl { LPCSTR pszIcon; UINT Message; diff --git a/plugins/SendScreenshotPlus/src/mir_string.cpp b/plugins/SendScreenshotPlus/src/mir_string.cpp index d3550e6a04..3ac9ffca3a 100644 --- a/plugins/SendScreenshotPlus/src/mir_string.cpp +++ b/plugins/SendScreenshotPlus/src/mir_string.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2009 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-09 Miranda ICQ/IM project,
This file is part of Send Screenshot Plus, a Miranda IM plugin.
Copyright (c) 2010 Ing.U.Horn
@@ -58,7 +59,7 @@ void mir_stradd(char* &pszDest, const char *pszSrc) size_t lenSrc = strlen(pszSrc);
size_t lenNew = lenDest + lenSrc + 1;
pszDest = (char *) mir_realloc(pszDest, sizeof(char)* lenNew);
-
+
strcpy(pszDest + lenDest, pszSrc);
pszDest[lenNew-1] = 0;
}
@@ -76,7 +77,7 @@ void mir_wcsadd(wchar_t* &pszDest, const wchar_t *pszSrc) size_t lenSrc = wcslen(pszSrc);
size_t lenNew = lenDest + lenSrc + 1;
pszDest = (wchar_t *) mir_realloc(pszDest, sizeof(wchar_t)*lenNew);
-
+
wcscpy(pszDest + lenDest, pszSrc);
pszDest[lenNew-1] = 0;
}
diff --git a/plugins/SendScreenshotPlus/src/mir_string.h b/plugins/SendScreenshotPlus/src/mir_string.h index 7c03b9dc48..95ab3496f1 100644 --- a/plugins/SendScreenshotPlus/src/mir_string.h +++ b/plugins/SendScreenshotPlus/src/mir_string.h @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-2009 Miranda ICQ/IM project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-09 Miranda ICQ/IM project,
This file is part of Send Screenshot Plus, a Miranda IM plugin.
Copyright (c) 2010 Ing.U.Horn
diff --git a/plugins/SendScreenshotPlus/src/stdafx.cpp b/plugins/SendScreenshotPlus/src/stdafx.cpp index 199436b7ed..c54e72861c 100644 --- a/plugins/SendScreenshotPlus/src/stdafx.cpp +++ b/plugins/SendScreenshotPlus/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Sessions/Src/stdafx.cpp b/plugins/Sessions/Src/stdafx.cpp index 70589d78d1..66947205e3 100644 --- a/plugins/Sessions/Src/stdafx.cpp +++ b/plugins/Sessions/Src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/ShellExt/src/stdafx.cpp b/plugins/ShellExt/src/stdafx.cpp index 1ddfafbbbd..88ac2c2369 100644 --- a/plugins/ShellExt/src/stdafx.cpp +++ b/plugins/ShellExt/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/SimpleAR/src/stdafx.cpp b/plugins/SimpleAR/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/SimpleAR/src/stdafx.cpp +++ b/plugins/SimpleAR/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp index 1946aa9b47..d4efe1478c 100644 --- a/plugins/SimpleStatusMsg/src/awaymsg.cpp +++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2010 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-10 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/SimpleStatusMsg/src/stdafx.cpp b/plugins/SimpleStatusMsg/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/SimpleStatusMsg/src/stdafx.cpp +++ b/plugins/SimpleStatusMsg/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/SkypeStatusChange/src/stdafx.cpp b/plugins/SkypeStatusChange/src/stdafx.cpp index 1ddfafbbbd..88ac2c2369 100644 --- a/plugins/SkypeStatusChange/src/stdafx.cpp +++ b/plugins/SkypeStatusChange/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/SmileyAdd/src/stdafx.cpp b/plugins/SmileyAdd/src/stdafx.cpp index 6ea3962f93..c94902cbb8 100644 --- a/plugins/SmileyAdd/src/stdafx.cpp +++ b/plugins/SmileyAdd/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Spamotron/src/stdafx.cpp b/plugins/Spamotron/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/Spamotron/src/stdafx.cpp +++ b/plugins/Spamotron/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/SpellChecker/src/stdafx.cpp b/plugins/SpellChecker/src/stdafx.cpp index 550c908371..3e55ac0306 100644 --- a/plugins/SpellChecker/src/stdafx.cpp +++ b/plugins/SpellChecker/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/SplashScreen/src/stdafx.cpp b/plugins/SplashScreen/src/stdafx.cpp index 48d92d3d56..5304ea985c 100644 --- a/plugins/SplashScreen/src/stdafx.cpp +++ b/plugins/SplashScreen/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/StartPosition/src/stdafx.cpp b/plugins/StartPosition/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/StartPosition/src/stdafx.cpp +++ b/plugins/StartPosition/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/StartupSilence/src/main.cpp b/plugins/StartupSilence/src/main.cpp index 47def43106..f81be2b195 100644 --- a/plugins/StartupSilence/src/main.cpp +++ b/plugins/StartupSilence/src/main.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2012-2013 Vladimir Lyubimov
-Copyright 2012-2013 Miranda-NG team,
+Copyright 2012-13 Vladimir Lyubimov
+Copyright 2012-14 Miranda NG team
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/StartupSilence/src/stdafx.cpp b/plugins/StartupSilence/src/stdafx.cpp index 4c76456ae4..173749ea9f 100644 --- a/plugins/StartupSilence/src/stdafx.cpp +++ b/plugins/StartupSilence/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/StatusChange/src/stdafx.cpp b/plugins/StatusChange/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/StatusChange/src/stdafx.cpp +++ b/plugins/StatusChange/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/StatusPlugins/stdafx.cpp b/plugins/StatusPlugins/stdafx.cpp index c3aca94efe..e676f52fc5 100644 --- a/plugins/StatusPlugins/stdafx.cpp +++ b/plugins/StatusPlugins/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/StopSpamMod/src/stdafx.cpp b/plugins/StopSpamMod/src/stdafx.cpp index 48d92d3d56..5304ea985c 100644 --- a/plugins/StopSpamMod/src/stdafx.cpp +++ b/plugins/StopSpamMod/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/StopSpamPlus/src/stdafx.cpp b/plugins/StopSpamPlus/src/stdafx.cpp index 48d92d3d56..5304ea985c 100644 --- a/plugins/StopSpamPlus/src/stdafx.cpp +++ b/plugins/StopSpamPlus/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/TabSRMM/src/ImageDataObject.cpp b/plugins/TabSRMM/src/ImageDataObject.cpp index c3965f02e3..27359f6a51 100644 --- a/plugins/TabSRMM/src/ImageDataObject.cpp +++ b/plugins/TabSRMM/src/ImageDataObject.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/TSButton.cpp b/plugins/TabSRMM/src/TSButton.cpp index f5f5fc9c22..ce68f6b70e 100644 --- a/plugins/TabSRMM/src/TSButton.cpp +++ b/plugins/TabSRMM/src/TSButton.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/chat/chat.h b/plugins/TabSRMM/src/chat/chat.h index 5ca2414e07..5f93dd1d64 100644 --- a/plugins/TabSRMM/src/chat/chat.h +++ b/plugins/TabSRMM/src/chat/chat.h @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/chat/colorchooser.cpp b/plugins/TabSRMM/src/chat/colorchooser.cpp index 53a0ae67cc..e8c59cdce0 100644 --- a/plugins/TabSRMM/src/chat/colorchooser.cpp +++ b/plugins/TabSRMM/src/chat/colorchooser.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/chat/log.cpp b/plugins/TabSRMM/src/chat/log.cpp index 0c8906516e..e2f0d56fa0 100644 --- a/plugins/TabSRMM/src/chat/log.cpp +++ b/plugins/TabSRMM/src/chat/log.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/chat/main.cpp b/plugins/TabSRMM/src/chat/main.cpp index 1953e081f4..63d41a9599 100644 --- a/plugins/TabSRMM/src/chat/main.cpp +++ b/plugins/TabSRMM/src/chat/main.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/chat/muchighlight.cpp b/plugins/TabSRMM/src/chat/muchighlight.cpp index e5d96b3ea4..079eddc6a8 100644 --- a/plugins/TabSRMM/src/chat/muchighlight.cpp +++ b/plugins/TabSRMM/src/chat/muchighlight.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/chat/muchighlight.h b/plugins/TabSRMM/src/chat/muchighlight.h index 8e9018778e..a752e5c0b0 100644 --- a/plugins/TabSRMM/src/chat/muchighlight.h +++ b/plugins/TabSRMM/src/chat/muchighlight.h @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp index 01d0d7d1d6..ed3ebd8f2d 100644 --- a/plugins/TabSRMM/src/chat/options.cpp +++ b/plugins/TabSRMM/src/chat/options.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/chat/services.cpp b/plugins/TabSRMM/src/chat/services.cpp index 87c5799b55..735738e024 100644 --- a/plugins/TabSRMM/src/chat/services.cpp +++ b/plugins/TabSRMM/src/chat/services.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp index 2019d6a4f5..d5aa8f1538 100644 --- a/plugins/TabSRMM/src/chat/tools.cpp +++ b/plugins/TabSRMM/src/chat/tools.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp index 8866ceeb7e..2446a8265e 100644 --- a/plugins/TabSRMM/src/chat/window.cpp +++ b/plugins/TabSRMM/src/chat/window.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/commonheaders.h b/plugins/TabSRMM/src/commonheaders.h index c06881e15b..2a3b608cb7 100644 --- a/plugins/TabSRMM/src/commonheaders.h +++ b/plugins/TabSRMM/src/commonheaders.h @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp index 791e8d4a28..bc0d140318 100644 --- a/plugins/TabSRMM/src/contactcache.cpp +++ b/plugins/TabSRMM/src/contactcache.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/contactcache.h b/plugins/TabSRMM/src/contactcache.h index d6684e9cd7..09deffbd46 100644 --- a/plugins/TabSRMM/src/contactcache.h +++ b/plugins/TabSRMM/src/contactcache.h @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp index 29375654f0..1d824cedf2 100644 --- a/plugins/TabSRMM/src/container.cpp +++ b/plugins/TabSRMM/src/container.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/containeroptions.cpp b/plugins/TabSRMM/src/containeroptions.cpp index f3f494c08f..5e2a6a1fbd 100644 --- a/plugins/TabSRMM/src/containeroptions.cpp +++ b/plugins/TabSRMM/src/containeroptions.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/controls.cpp b/plugins/TabSRMM/src/controls.cpp index 3801fa25f7..df63872efa 100644 --- a/plugins/TabSRMM/src/controls.cpp +++ b/plugins/TabSRMM/src/controls.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/controls.h b/plugins/TabSRMM/src/controls.h index f549ff8e7b..ddf13eee7b 100644 --- a/plugins/TabSRMM/src/controls.h +++ b/plugins/TabSRMM/src/controls.h @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp index e0164d4d59..92499a98ee 100644 --- a/plugins/TabSRMM/src/eventpopups.cpp +++ b/plugins/TabSRMM/src/eventpopups.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/functions.h b/plugins/TabSRMM/src/functions.h index 88a0a852be..021291068d 100644 --- a/plugins/TabSRMM/src/functions.h +++ b/plugins/TabSRMM/src/functions.h @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp index cf99dc2b80..005ff4d7e6 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.cpp +++ b/plugins/TabSRMM/src/generic_msghandlers.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/generic_msghandlers.h b/plugins/TabSRMM/src/generic_msghandlers.h index 2829b42683..5ad6ecbfdf 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.h +++ b/plugins/TabSRMM/src/generic_msghandlers.h @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index eccaaa9847..895ea2797a 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h index 37657f275a..4bd7cc379c 100644 --- a/plugins/TabSRMM/src/globals.h +++ b/plugins/TabSRMM/src/globals.h @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp index 2ea917eca0..03e948a030 100644 --- a/plugins/TabSRMM/src/hotkeyhandler.cpp +++ b/plugins/TabSRMM/src/hotkeyhandler.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/infopanel.cpp b/plugins/TabSRMM/src/infopanel.cpp index 19fb5e3ecf..f319c6238e 100644 --- a/plugins/TabSRMM/src/infopanel.cpp +++ b/plugins/TabSRMM/src/infopanel.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/infopanel.h b/plugins/TabSRMM/src/infopanel.h index 5d31750e56..cd5a25031f 100644 --- a/plugins/TabSRMM/src/infopanel.h +++ b/plugins/TabSRMM/src/infopanel.h @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp index b3282248e6..9ecc0dd3cd 100644 --- a/plugins/TabSRMM/src/mim.cpp +++ b/plugins/TabSRMM/src/mim.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/mim.h b/plugins/TabSRMM/src/mim.h index 8f84731d54..e79f38077a 100644 --- a/plugins/TabSRMM/src/mim.h +++ b/plugins/TabSRMM/src/mim.h @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/modplus.cpp b/plugins/TabSRMM/src/modplus.cpp index b616276f0e..646a820590 100644 --- a/plugins/TabSRMM/src/modplus.cpp +++ b/plugins/TabSRMM/src/modplus.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 811b8cd2d2..3d61c08919 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index 0d50727f04..0811526d45 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/msgdlgutils.h b/plugins/TabSRMM/src/msgdlgutils.h index 37589fa1d4..0b9aac3e20 100644 --- a/plugins/TabSRMM/src/msgdlgutils.h +++ b/plugins/TabSRMM/src/msgdlgutils.h @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp index 549351f151..958d02b1c3 100644 --- a/plugins/TabSRMM/src/msglog.cpp +++ b/plugins/TabSRMM/src/msglog.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp index 14662c09fc..b20621c51a 100644 --- a/plugins/TabSRMM/src/msgoptions.cpp +++ b/plugins/TabSRMM/src/msgoptions.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/msgoptions_plus.cpp b/plugins/TabSRMM/src/msgoptions_plus.cpp index 43c24a9f8f..ed12c8040a 100644 --- a/plugins/TabSRMM/src/msgoptions_plus.cpp +++ b/plugins/TabSRMM/src/msgoptions_plus.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp index d4c3cab951..fb7fe23bb8 100644 --- a/plugins/TabSRMM/src/msgs.cpp +++ b/plugins/TabSRMM/src/msgs.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h index 467083fbb6..fd88db1c62 100644 --- a/plugins/TabSRMM/src/msgs.h +++ b/plugins/TabSRMM/src/msgs.h @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/nen.h b/plugins/TabSRMM/src/nen.h index fdc23c0abb..cb7c400a53 100644 --- a/plugins/TabSRMM/src/nen.h +++ b/plugins/TabSRMM/src/nen.h @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/selectcontainer.cpp b/plugins/TabSRMM/src/selectcontainer.cpp index 9dc569f9ff..c04016ae29 100644 --- a/plugins/TabSRMM/src/selectcontainer.cpp +++ b/plugins/TabSRMM/src/selectcontainer.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp index 085e1d99cd..e3d1122171 100644 --- a/plugins/TabSRMM/src/sendlater.cpp +++ b/plugins/TabSRMM/src/sendlater.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/sendlater.h b/plugins/TabSRMM/src/sendlater.h index c928789ce7..3ac3d1b302 100644 --- a/plugins/TabSRMM/src/sendlater.h +++ b/plugins/TabSRMM/src/sendlater.h @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp index c0b57d9540..a3a0764f30 100644 --- a/plugins/TabSRMM/src/sendqueue.cpp +++ b/plugins/TabSRMM/src/sendqueue.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/sendqueue.h b/plugins/TabSRMM/src/sendqueue.h index dff4ce43f0..05dec3a0d2 100644 --- a/plugins/TabSRMM/src/sendqueue.h +++ b/plugins/TabSRMM/src/sendqueue.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2009 Miranda ICQ/IM project,
+Copyright (c) 2000-09 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/sidebar.cpp b/plugins/TabSRMM/src/sidebar.cpp index c8e154078e..aa4d89dc70 100644 --- a/plugins/TabSRMM/src/sidebar.cpp +++ b/plugins/TabSRMM/src/sidebar.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/sidebar.h b/plugins/TabSRMM/src/sidebar.h index 4c7c25d908..71e1f4070b 100644 --- a/plugins/TabSRMM/src/sidebar.h +++ b/plugins/TabSRMM/src/sidebar.h @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/srmm.cpp b/plugins/TabSRMM/src/srmm.cpp index a133255991..2df7517252 100644 --- a/plugins/TabSRMM/src/srmm.cpp +++ b/plugins/TabSRMM/src/srmm.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/stdafx.cpp b/plugins/TabSRMM/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/TabSRMM/src/stdafx.cpp +++ b/plugins/TabSRMM/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/TabSRMM/src/tabctrl.cpp b/plugins/TabSRMM/src/tabctrl.cpp index 945b7c0c98..b939e197a3 100644 --- a/plugins/TabSRMM/src/tabctrl.cpp +++ b/plugins/TabSRMM/src/tabctrl.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/taskbar.cpp b/plugins/TabSRMM/src/taskbar.cpp index a54762960b..845db5d2da 100644 --- a/plugins/TabSRMM/src/taskbar.cpp +++ b/plugins/TabSRMM/src/taskbar.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/taskbar.h b/plugins/TabSRMM/src/taskbar.h index 0a7efc0537..386ed70b5c 100644 --- a/plugins/TabSRMM/src/taskbar.h +++ b/plugins/TabSRMM/src/taskbar.h @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/templates.cpp b/plugins/TabSRMM/src/templates.cpp index eb0764cd0d..9d883d6e09 100644 --- a/plugins/TabSRMM/src/templates.cpp +++ b/plugins/TabSRMM/src/templates.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/templates.h b/plugins/TabSRMM/src/templates.h index da64354204..dc2cff5b1a 100644 --- a/plugins/TabSRMM/src/templates.h +++ b/plugins/TabSRMM/src/templates.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/themeio.cpp b/plugins/TabSRMM/src/themeio.cpp index baeece0864..b04cb9cd2b 100644 --- a/plugins/TabSRMM/src/themeio.cpp +++ b/plugins/TabSRMM/src/themeio.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp index 68358ec09e..f0486c071b 100644 --- a/plugins/TabSRMM/src/themes.cpp +++ b/plugins/TabSRMM/src/themes.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/themes.h b/plugins/TabSRMM/src/themes.h index c611bfcdb2..4d0e81e363 100644 --- a/plugins/TabSRMM/src/themes.h +++ b/plugins/TabSRMM/src/themes.h @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/translator.cpp b/plugins/TabSRMM/src/translator.cpp index 8eccb5881b..69b35832e3 100644 --- a/plugins/TabSRMM/src/translator.cpp +++ b/plugins/TabSRMM/src/translator.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/translator.h b/plugins/TabSRMM/src/translator.h index 38f56b52b7..7f74a252f6 100644 --- a/plugins/TabSRMM/src/translator.h +++ b/plugins/TabSRMM/src/translator.h @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/trayicon.cpp b/plugins/TabSRMM/src/trayicon.cpp index 6d38355acf..53f93000a5 100644 --- a/plugins/TabSRMM/src/trayicon.cpp +++ b/plugins/TabSRMM/src/trayicon.cpp @@ -4,7 +4,7 @@ *
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/userprefs.cpp b/plugins/TabSRMM/src/userprefs.cpp index 651a3f02aa..a5b57a9287 100644 --- a/plugins/TabSRMM/src/userprefs.cpp +++ b/plugins/TabSRMM/src/userprefs.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp index ff48ab50ec..0a5f314f70 100644 --- a/plugins/TabSRMM/src/utils.cpp +++ b/plugins/TabSRMM/src/utils.cpp @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TabSRMM/src/utils.h b/plugins/TabSRMM/src/utils.h index 3df71f94ea..88c82acd3d 100644 --- a/plugins/TabSRMM/src/utils.h +++ b/plugins/TabSRMM/src/utils.h @@ -1,7 +1,7 @@ /*
* Miranda NG: the free IM client for Microsoft* Windows*
*
- * Copyright 2000-2009 Miranda ICQ/IM project,
+ * Copyright (c) 2000-09 Miranda ICQ/IM project,
* all portions of this codebase are copyrighted to the people
* listed in contributors.txt.
*
diff --git a/plugins/TipperYM/src/stdafx.cpp b/plugins/TipperYM/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/TipperYM/src/stdafx.cpp +++ b/plugins/TipperYM/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/TopToolBar/src/stdafx.cpp b/plugins/TopToolBar/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/TopToolBar/src/stdafx.cpp +++ b/plugins/TopToolBar/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/TranslitSwitcher/src/stdafx.cpp b/plugins/TranslitSwitcher/src/stdafx.cpp index a3b243ddf5..62edd228f5 100644 --- a/plugins/TranslitSwitcher/src/stdafx.cpp +++ b/plugins/TranslitSwitcher/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserGuide/src/stdafx.cpp b/plugins/UserGuide/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/UserGuide/src/stdafx.cpp +++ b/plugins/UserGuide/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/stdafx.cpp b/plugins/UserInfoEx/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/UserInfoEx/src/stdafx.cpp +++ b/plugins/UserInfoEx/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Variables/src/stdafx.cpp b/plugins/Variables/src/stdafx.cpp index a66754d15f..86b2a6dc12 100644 --- a/plugins/Variables/src/stdafx.cpp +++ b/plugins/Variables/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/VersionInfo/src/stdafx.cpp b/plugins/VersionInfo/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/VersionInfo/src/stdafx.cpp +++ b/plugins/VersionInfo/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Watrack_MPD/src/stdafx.cpp b/plugins/Watrack_MPD/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/Watrack_MPD/src/stdafx.cpp +++ b/plugins/Watrack_MPD/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Weather/src/weather.h b/plugins/Weather/src/weather.h index f15bb518cf..0130a8e383 100644 --- a/plugins/Weather/src/weather.h +++ b/plugins/Weather/src/weather.h @@ -1,6 +1,6 @@ /*
Weather Protocol plugin for Miranda NG
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2005-2011 Boris Krasnovskiy All Rights Reserved
Copyright (c) 2002-2005 Calvin Che
diff --git a/plugins/WhenWasIt/src/stdafx.cpp b/plugins/WhenWasIt/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/WhenWasIt/src/stdafx.cpp +++ b/plugins/WhenWasIt/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhoUsesMyFiles/src/stdafx.cpp b/plugins/WhoUsesMyFiles/src/stdafx.cpp index d0b1b5a1f0..b5489fb5ec 100644 --- a/plugins/WhoUsesMyFiles/src/stdafx.cpp +++ b/plugins/WhoUsesMyFiles/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WinterSpeak/src/stdafx.cpp b/plugins/WinterSpeak/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/WinterSpeak/src/stdafx.cpp +++ b/plugins/WinterSpeak/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/XSoundNotify/src/stdafx.cpp b/plugins/XSoundNotify/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/XSoundNotify/src/stdafx.cpp +++ b/plugins/XSoundNotify/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/YAMN/src/stdafx.cpp b/plugins/YAMN/src/stdafx.cpp index 90bdc1cb6c..eef0737539 100644 --- a/plugins/YAMN/src/stdafx.cpp +++ b/plugins/YAMN/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/YAPP/src/stdafx.cpp b/plugins/YAPP/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/YAPP/src/stdafx.cpp +++ b/plugins/YAPP/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/YARelay/src/stdafx.cpp b/plugins/YARelay/src/stdafx.cpp index 1ddfafbbbd..88ac2c2369 100644 --- a/plugins/YARelay/src/stdafx.cpp +++ b/plugins/YARelay/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/YahooGroups/src/stdafx.cpp b/plugins/YahooGroups/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/YahooGroups/src/stdafx.cpp +++ b/plugins/YahooGroups/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/ZeroNotification/src/stdafx.cpp b/plugins/ZeroNotification/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/plugins/ZeroNotification/src/stdafx.cpp +++ b/plugins/ZeroNotification/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/helpers/commonheaders.h b/plugins/helpers/commonheaders.h index 6b97036862..30de8f9cf2 100644 --- a/plugins/helpers/commonheaders.h +++ b/plugins/helpers/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2003 Miranda ICQ/IM project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/mTextControl/src/stdafx.cpp b/plugins/mTextControl/src/stdafx.cpp index 48d92d3d56..5304ea985c 100644 --- a/plugins/mTextControl/src/stdafx.cpp +++ b/plugins/mTextControl/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/wbOSD/src/stdafx.cpp b/plugins/wbOSD/src/stdafx.cpp index 68250bbb4e..62b0d13910 100644 --- a/plugins/wbOSD/src/stdafx.cpp +++ b/plugins/wbOSD/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/AimOscar/src/stdafx.cpp b/protocols/AimOscar/src/stdafx.cpp index e2412f28f3..2c4ce0f8d4 100644 --- a/protocols/AimOscar/src/stdafx.cpp +++ b/protocols/AimOscar/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/FacebookRM/src/stdafx.cpp b/protocols/FacebookRM/src/stdafx.cpp index daf55e12b3..2033005cd4 100644 --- a/protocols/FacebookRM/src/stdafx.cpp +++ b/protocols/FacebookRM/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG team (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/Gadu-Gadu/src/stdafx.cpp b/protocols/Gadu-Gadu/src/stdafx.cpp index ad9946a2f9..d0b5a7a4f5 100644 --- a/protocols/Gadu-Gadu/src/stdafx.cpp +++ b/protocols/Gadu-Gadu/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/IRCG/src/stdafx.cpp b/protocols/IRCG/src/stdafx.cpp index 1bc659d765..588478af6b 100644 --- a/protocols/IRCG/src/stdafx.cpp +++ b/protocols/IRCG/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/stdafx.cpp b/protocols/IcqOscarJ/src/stdafx.cpp index e5b840cc4e..6eb1e9b7ee 100644 --- a/protocols/IcqOscarJ/src/stdafx.cpp +++ b/protocols/IcqOscarJ/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp index 65fada8970..da5465fa19 100644 --- a/protocols/JabberG/src/jabber.cpp +++ b/protocols/JabberG/src/jabber.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber.h b/protocols/JabberG/src/jabber.h index fcfe626e32..12b08265db 100644 --- a/protocols/JabberG/src/jabber.h +++ b/protocols/JabberG/src/jabber.h @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp index 6786140aa4..57f5346609 100644 --- a/protocols/JabberG/src/jabber_adhoc.cpp +++ b/protocols/JabberG/src/jabber_adhoc.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Artem Shpynov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
Module implements an XMPP protocol extension for reporting and executing ad-hoc,
human-oriented commands according to XEP-0050: Ad-Hoc Commands
diff --git a/protocols/JabberG/src/jabber_agent.cpp b/protocols/JabberG/src/jabber_agent.cpp index bc0a3d7e3a..ba3227c516 100644 --- a/protocols/JabberG/src/jabber_agent.cpp +++ b/protocols/JabberG/src/jabber_agent.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_api.cpp b/protocols/JabberG/src/jabber_api.cpp index 7838260aec..8eb0d5352b 100644 --- a/protocols/JabberG/src/jabber_api.cpp +++ b/protocols/JabberG/src/jabber_api.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_archive.cpp b/protocols/JabberG/src/jabber_archive.cpp index 57700a86a5..f3244527cd 100644 --- a/protocols/JabberG/src/jabber_archive.cpp +++ b/protocols/JabberG/src/jabber_archive.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp index 7c4870ea80..b74bf6191b 100644 --- a/protocols/JabberG/src/jabber_bookmarks.cpp +++ b/protocols/JabberG/src/jabber_bookmarks.cpp @@ -2,7 +2,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2007 Michael Stepura, George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_byte.cpp b/protocols/JabberG/src/jabber_byte.cpp index f3e3c4d0ea..7674ff8aaf 100644 --- a/protocols/JabberG/src/jabber_byte.cpp +++ b/protocols/JabberG/src/jabber_byte.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_byte.h b/protocols/JabberG/src/jabber_byte.h index e03b4bc636..e2058101fb 100644 --- a/protocols/JabberG/src/jabber_byte.h +++ b/protocols/JabberG/src/jabber_byte.h @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_caps.cpp b/protocols/JabberG/src/jabber_caps.cpp index ac71cdd416..bb7220acfc 100644 --- a/protocols/JabberG/src/jabber_caps.cpp +++ b/protocols/JabberG/src/jabber_caps.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_caps.h b/protocols/JabberG/src/jabber_caps.h index 20a04452c1..db0a1d4bac 100644 --- a/protocols/JabberG/src/jabber_caps.h +++ b/protocols/JabberG/src/jabber_caps.h @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_captcha.cpp b/protocols/JabberG/src/jabber_captcha.cpp index 687b8487dd..e553f7c3ce 100644 --- a/protocols/JabberG/src/jabber_captcha.cpp +++ b/protocols/JabberG/src/jabber_captcha.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index a0041a3cec..279537f56b 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_console.cpp b/protocols/JabberG/src/jabber_console.cpp index e73742b119..6bf4a1701d 100644 --- a/protocols/JabberG/src/jabber_console.cpp +++ b/protocols/JabberG/src/jabber_console.cpp @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
Copyright (C) 2007 Victor Pavlychko
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_db_utils.h b/protocols/JabberG/src/jabber_db_utils.h index 519b6c450f..ac70727035 100644 --- a/protocols/JabberG/src/jabber_db_utils.h +++ b/protocols/JabberG/src/jabber_db_utils.h @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-12 George Hazan
Copyright (C) 2007-09 Maxim Mluhov
Copyright (C) 2007-09 Victor Pavlychko
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp index a60607d121..43fee1315b 100644 --- a/protocols/JabberG/src/jabber_disco.cpp +++ b/protocols/JabberG/src/jabber_disco.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_disco.h b/protocols/JabberG/src/jabber_disco.h index cec8845952..09da53754c 100644 --- a/protocols/JabberG/src/jabber_disco.h +++ b/protocols/JabberG/src/jabber_disco.h @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2005-07 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp index 29d84fe4e7..560747493f 100644 --- a/protocols/JabberG/src/jabber_events.cpp +++ b/protocols/JabberG/src/jabber_events.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_file.cpp b/protocols/JabberG/src/jabber_file.cpp index b7556ca9af..da5f8ea208 100644 --- a/protocols/JabberG/src/jabber_file.cpp +++ b/protocols/JabberG/src/jabber_file.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_form.cpp b/protocols/JabberG/src/jabber_form.cpp index 4e46791804..4eb225a303 100644 --- a/protocols/JabberG/src/jabber_form.cpp +++ b/protocols/JabberG/src/jabber_form.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_form2.cpp b/protocols/JabberG/src/jabber_form2.cpp index 72766f4efa..d13054eae3 100644 --- a/protocols/JabberG/src/jabber_form2.cpp +++ b/protocols/JabberG/src/jabber_form2.cpp @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-12 George Hazan
Copyright (C) 2007-09 Maxim Mluhov
Copyright (C) 2007-09 Victor Pavlychko
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_form2.h b/protocols/JabberG/src/jabber_form2.h index 524455f2b9..b15eee8532 100644 --- a/protocols/JabberG/src/jabber_form2.h +++ b/protocols/JabberG/src/jabber_form2.h @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-12 George Hazan
Copyright (C) 2007-09 Maxim Mluhov
Copyright (C) 2007-09 Victor Pavlychko
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_frame.cpp b/protocols/JabberG/src/jabber_frame.cpp index 045a136910..355bb2f29d 100644 --- a/protocols/JabberG/src/jabber_frame.cpp +++ b/protocols/JabberG/src/jabber_frame.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_ft.cpp b/protocols/JabberG/src/jabber_ft.cpp index 08c733c66a..72b0eb4022 100644 --- a/protocols/JabberG/src/jabber_ft.cpp +++ b/protocols/JabberG/src/jabber_ft.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp index f671e163c6..b1f3f6a7cf 100644 --- a/protocols/JabberG/src/jabber_groupchat.cpp +++ b/protocols/JabberG/src/jabber_groupchat.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_ibb.cpp b/protocols/JabberG/src/jabber_ibb.cpp index c95c22e2c5..2caab55ec8 100644 --- a/protocols/JabberG/src/jabber_ibb.cpp +++ b/protocols/JabberG/src/jabber_ibb.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_ibb.h b/protocols/JabberG/src/jabber_ibb.h index 2778a6f3c3..d208ccda3d 100644 --- a/protocols/JabberG/src/jabber_ibb.h +++ b/protocols/JabberG/src/jabber_ibb.h @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp index bc76f927c5..c538e3fb55 100644 --- a/protocols/JabberG/src/jabber_icolib.cpp +++ b/protocols/JabberG/src/jabber_icolib.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
Idea & portions of code by Artem Shpynov
diff --git a/protocols/JabberG/src/jabber_icolib.h b/protocols/JabberG/src/jabber_icolib.h index 4cf0b1e84e..69dc19a78d 100644 --- a/protocols/JabberG/src/jabber_icolib.h +++ b/protocols/JabberG/src/jabber_icolib.h @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-12 George Hazan
Copyright (C) 2007-09 Maxim Mluhov
Copyright (C) 2007-09 Victor Pavlychko
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_iq.cpp b/protocols/JabberG/src/jabber_iq.cpp index 3e2d823fbb..1e18d31665 100644 --- a/protocols/JabberG/src/jabber_iq.cpp +++ b/protocols/JabberG/src/jabber_iq.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_iq.h b/protocols/JabberG/src/jabber_iq.h index cf1c42bbe4..acaa90a47d 100644 --- a/protocols/JabberG/src/jabber_iq.h +++ b/protocols/JabberG/src/jabber_iq.h @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp index 04b79fcbb9..b1974bd2a7 100644 --- a/protocols/JabberG/src/jabber_iq_handlers.cpp +++ b/protocols/JabberG/src/jabber_iq_handlers.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index ffc1fb3580..99c00a5a18 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_iqid_muc.cpp b/protocols/JabberG/src/jabber_iqid_muc.cpp index 03541de642..53f7054aae 100644 --- a/protocols/JabberG/src/jabber_iqid_muc.cpp +++ b/protocols/JabberG/src/jabber_iqid_muc.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_libstr.cpp b/protocols/JabberG/src/jabber_libstr.cpp index accda7725a..d3b41a03a8 100644 --- a/protocols/JabberG/src/jabber_libstr.cpp +++ b/protocols/JabberG/src/jabber_libstr.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_list.cpp b/protocols/JabberG/src/jabber_list.cpp index d6930918f0..5f84a793cd 100644 --- a/protocols/JabberG/src/jabber_list.cpp +++ b/protocols/JabberG/src/jabber_list.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_list.h b/protocols/JabberG/src/jabber_list.h index d7e9fe8f4d..417db9e7be 100644 --- a/protocols/JabberG/src/jabber_list.h +++ b/protocols/JabberG/src/jabber_list.h @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index 43025b38f8..1db486973d 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_message_handlers.cpp b/protocols/JabberG/src/jabber_message_handlers.cpp index f78643a100..15de847a36 100644 --- a/protocols/JabberG/src/jabber_message_handlers.cpp +++ b/protocols/JabberG/src/jabber_message_handlers.cpp @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-08 George Hazan
Copyright (C) 2007 Maxim Mluhov
Copyright (C) 2008-09 Dmitriy Chervov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_message_manager.cpp b/protocols/JabberG/src/jabber_message_manager.cpp index b69fc5ed75..b15ff40e07 100644 --- a/protocols/JabberG/src/jabber_message_manager.cpp +++ b/protocols/JabberG/src/jabber_message_manager.cpp @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-08 George Hazan
Copyright (C) 2007 Maxim Mluhov
Copyright (C) 2008-09 Dmitriy Chervov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_message_manager.h b/protocols/JabberG/src/jabber_message_manager.h index ac655b547c..90df627a88 100644 --- a/protocols/JabberG/src/jabber_message_manager.h +++ b/protocols/JabberG/src/jabber_message_manager.h @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-08 George Hazan
Copyright (C) 2007 Maxim Mluhov
Copyright (C) 2008-09 Dmitriy Chervov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp index 86bebdf450..0cff2727c5 100644 --- a/protocols/JabberG/src/jabber_misc.cpp +++ b/protocols/JabberG/src/jabber_misc.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_notes.cpp b/protocols/JabberG/src/jabber_notes.cpp index 437679cd57..460a4afe1d 100644 --- a/protocols/JabberG/src/jabber_notes.cpp +++ b/protocols/JabberG/src/jabber_notes.cpp @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-12 George Hazan
Copyright (C) 2007-09 Maxim Mluhov
Copyright (C) 2007-09 Victor Pavlychko
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_notes.h b/protocols/JabberG/src/jabber_notes.h index d580acf345..a9d8f2d8aa 100644 --- a/protocols/JabberG/src/jabber_notes.h +++ b/protocols/JabberG/src/jabber_notes.h @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-12 George Hazan
Copyright (C) 2007-09 Maxim Mluhov
Copyright (C) 2007-09 Victor Pavlychko
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index 089a486aa3..a55c29a9a5 100644 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_opttree.cpp b/protocols/JabberG/src/jabber_opttree.cpp index 3745624755..498c66c0b3 100644 --- a/protocols/JabberG/src/jabber_opttree.cpp +++ b/protocols/JabberG/src/jabber_opttree.cpp @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
Copyright (C) 2007 Victor Pavlychko
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_opttree.h b/protocols/JabberG/src/jabber_opttree.h index 2b9425c952..8b19843989 100644 --- a/protocols/JabberG/src/jabber_opttree.h +++ b/protocols/JabberG/src/jabber_opttree.h @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
Copyright (C) 2007 Victor Pavlychko
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_password.cpp b/protocols/JabberG/src/jabber_password.cpp index 3a5c7d65f0..c2e1ed8e15 100644 --- a/protocols/JabberG/src/jabber_password.cpp +++ b/protocols/JabberG/src/jabber_password.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_presence_manager.cpp b/protocols/JabberG/src/jabber_presence_manager.cpp index 78fefd1c96..5ca23d39fa 100644 --- a/protocols/JabberG/src/jabber_presence_manager.cpp +++ b/protocols/JabberG/src/jabber_presence_manager.cpp @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-08 George Hazan
Copyright (C) 2007 Maxim Mluhov
Copyright (C) 2008-09 Dmitriy Chervov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_presence_manager.h b/protocols/JabberG/src/jabber_presence_manager.h index bc061205fc..65e3e55713 100644 --- a/protocols/JabberG/src/jabber_presence_manager.h +++ b/protocols/JabberG/src/jabber_presence_manager.h @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-08 George Hazan
Copyright (C) 2007 Maxim Mluhov
Copyright (C) 2008-09 Dmitriy Chervov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index e26ba930a4..a70c6de060 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-12 George Hazan
Copyright (C) 2007-09 Maxim Mluhov
Copyright (C) 2007-09 Victor Pavlychko
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_privacy.h b/protocols/JabberG/src/jabber_privacy.h index 6867b8b073..c289653bcf 100644 --- a/protocols/JabberG/src/jabber_privacy.h +++ b/protocols/JabberG/src/jabber_privacy.h @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 79e5cf523d..3eb45ebe43 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h index b633eefcfd..a5d2edcb42 100644 --- a/protocols/JabberG/src/jabber_proto.h +++ b/protocols/JabberG/src/jabber_proto.h @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_rc.cpp b/protocols/JabberG/src/jabber_rc.cpp index b5cf36b79e..71434e0874 100644 --- a/protocols/JabberG/src/jabber_rc.cpp +++ b/protocols/JabberG/src/jabber_rc.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
XEP-0146 support for Miranda IM
diff --git a/protocols/JabberG/src/jabber_rc.h b/protocols/JabberG/src/jabber_rc.h index 27c26f3ab9..3c927e5e34 100644 --- a/protocols/JabberG/src/jabber_rc.h +++ b/protocols/JabberG/src/jabber_rc.h @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
XEP-0146 support for Miranda IM
diff --git a/protocols/JabberG/src/jabber_search.cpp b/protocols/JabberG/src/jabber_search.cpp index 31bcb3f202..ff49a86ce5 100644 --- a/protocols/JabberG/src/jabber_search.cpp +++ b/protocols/JabberG/src/jabber_search.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Artem Shpynov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
Module implements a search according to XEP-0055: Jabber Search
http://www.xmpp.org/extensions/xep-0055.html
diff --git a/protocols/JabberG/src/jabber_search.h b/protocols/JabberG/src/jabber_search.h index 1c1cc0af69..b40fe1b839 100644 --- a/protocols/JabberG/src/jabber_search.h +++ b/protocols/JabberG/src/jabber_search.h @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Artem Shpynov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
Module implements a search according to XEP-0055: Jabber Search
http://www.xmpp.org/extensions/xep-0055.html
diff --git a/protocols/JabberG/src/jabber_secur.cpp b/protocols/JabberG/src/jabber_secur.cpp index 126bed41e9..4f5aafc64d 100644 --- a/protocols/JabberG/src/jabber_secur.cpp +++ b/protocols/JabberG/src/jabber_secur.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_secur.h b/protocols/JabberG/src/jabber_secur.h index 838e11367b..7e58f058d4 100644 --- a/protocols/JabberG/src/jabber_secur.h +++ b/protocols/JabberG/src/jabber_secur.h @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_send_manager.cpp b/protocols/JabberG/src/jabber_send_manager.cpp index 919f09b2b0..18b6501fab 100644 --- a/protocols/JabberG/src/jabber_send_manager.cpp +++ b/protocols/JabberG/src/jabber_send_manager.cpp @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-08 George Hazan
Copyright (C) 2007 Maxim Mluhov
Copyright (C) 2008-09 Dmitriy Chervov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_send_manager.h b/protocols/JabberG/src/jabber_send_manager.h index dfda635fdc..aa358a853d 100644 --- a/protocols/JabberG/src/jabber_send_manager.h +++ b/protocols/JabberG/src/jabber_send_manager.h @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-08 George Hazan
Copyright (C) 2007 Maxim Mluhov
Copyright (C) 2008-09 Dmitriy Chervov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_std.cpp b/protocols/JabberG/src/jabber_std.cpp index cd6f95e4a1..95d874eb52 100644 --- a/protocols/JabberG/src/jabber_std.cpp +++ b/protocols/JabberG/src/jabber_std.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp index 2294aad21b..afa0db8b5a 100644 --- a/protocols/JabberG/src/jabber_svc.cpp +++ b/protocols/JabberG/src/jabber_svc.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 957ab6cb00..b81521b2e6 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_treelist.cpp b/protocols/JabberG/src/jabber_treelist.cpp index 1936c6e8ca..60b9e92089 100644 --- a/protocols/JabberG/src/jabber_treelist.cpp +++ b/protocols/JabberG/src/jabber_treelist.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Victor Pavlychko
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp index e93c7d07e8..9fc143835d 100644 --- a/protocols/JabberG/src/jabber_userinfo.cpp +++ b/protocols/JabberG/src/jabber_userinfo.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp index d3741151ba..0b07c6f3fd 100644 --- a/protocols/JabberG/src/jabber_util.cpp +++ b/protocols/JabberG/src/jabber_util.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp index 8b3337fca8..901b663573 100644 --- a/protocols/JabberG/src/jabber_vcard.cpp +++ b/protocols/JabberG/src/jabber_vcard.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_ws.cpp b/protocols/JabberG/src/jabber_ws.cpp index ef1f15bd98..d0c3b66b45 100644 --- a/protocols/JabberG/src/jabber_ws.cpp +++ b/protocols/JabberG/src/jabber_ws.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda IM
Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_xml.cpp b/protocols/JabberG/src/jabber_xml.cpp index 07e1dae2a1..90bad833c1 100644 --- a/protocols/JabberG/src/jabber_xml.cpp +++ b/protocols/JabberG/src/jabber_xml.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_xml.h b/protocols/JabberG/src/jabber_xml.h index c9a9c041fc..533b2ec648 100644 --- a/protocols/JabberG/src/jabber_xml.h +++ b/protocols/JabberG/src/jabber_xml.h @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp index 064917c5c0..565ac52fb6 100644 --- a/protocols/JabberG/src/jabber_xstatus.cpp +++ b/protocols/JabberG/src/jabber_xstatus.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda IM Copyright (C) 2002-04 Santithorn Bunchua
Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Maxim Mluhov
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_xstatus.h b/protocols/JabberG/src/jabber_xstatus.h index 51b874f8c7..490594817e 100644 --- a/protocols/JabberG/src/jabber_xstatus.h +++ b/protocols/JabberG/src/jabber_xstatus.h @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-12 George Hazan
Copyright (C) 2007-09 Maxim Mluhov
Copyright (C) 2007-09 Victor Pavlychko
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_zstream.cpp b/protocols/JabberG/src/jabber_zstream.cpp index edc5d5071c..af4e4a6004 100644 --- a/protocols/JabberG/src/jabber_zstream.cpp +++ b/protocols/JabberG/src/jabber_zstream.cpp @@ -5,7 +5,7 @@ XEP-0138 (Stream Compression) implementation Copyright (C) 2005-12 George Hazan
Copyright (C) 2007 Kostya Chukavin, Taras Zackrepa
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/stdafx.cpp b/protocols/JabberG/src/stdafx.cpp index 044195e26b..b8069760ae 100644 --- a/protocols/JabberG/src/stdafx.cpp +++ b/protocols/JabberG/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/ui_utils.cpp b/protocols/JabberG/src/ui_utils.cpp index 96606221ca..a25002b95b 100644 --- a/protocols/JabberG/src/ui_utils.cpp +++ b/protocols/JabberG/src/ui_utils.cpp @@ -2,7 +2,7 @@ Object UI extensions
Copyright (C) 2008 Victor Pavlychko, George Hazan
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/ui_utils.h b/protocols/JabberG/src/ui_utils.h index bae324ee0f..5707ff2cba 100644 --- a/protocols/JabberG/src/ui_utils.h +++ b/protocols/JabberG/src/ui_utils.h @@ -5,7 +5,7 @@ Copyright (C) 2002-04 Santithorn Bunchua Copyright (C) 2005-12 George Hazan
Copyright (C) 2007-09 Maxim Mluhov
Copyright (C) 2007-09 Victor Pavlychko
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-13 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/MRA/src/stdafx.cpp b/protocols/MRA/src/stdafx.cpp index 6132fe88cb..6477a76154 100644 --- a/protocols/MRA/src/stdafx.cpp +++ b/protocols/MRA/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/MSN/src/msn.cpp b/protocols/MSN/src/msn.cpp index 5bbfd707d3..9978aef0b8 100644 --- a/protocols/MSN/src/msn.cpp +++ b/protocols/MSN/src/msn.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_auth.cpp b/protocols/MSN/src/msn_auth.cpp index 172c74cab9..50fa33305d 100644 --- a/protocols/MSN/src/msn_auth.cpp +++ b/protocols/MSN/src/msn_auth.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2007-2012 Boris Krasnovskiy.
This program is free software; you can redistribute it and/or
diff --git a/protocols/MSN/src/msn_avatar.cpp b/protocols/MSN/src/msn_avatar.cpp index 5af6b7ad87..45abcf490c 100644 --- a/protocols/MSN/src/msn_avatar.cpp +++ b/protocols/MSN/src/msn_avatar.cpp @@ -1,8 +1,7 @@ /*
Plugin for Miranda NG for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
-Copyright (c) 2013 Miranda NG Team
+Copyright (c) 2012-14 Miranda NG Team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp index f46ea96ce3..d7e2bc3f90 100644 --- a/protocols/MSN/src/msn_chat.cpp +++ b/protocols/MSN/src/msn_chat.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp index 7254276101..aa8fe39c21 100644 --- a/protocols/MSN/src/msn_commands.cpp +++ b/protocols/MSN/src/msn_commands.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_contact.cpp b/protocols/MSN/src/msn_contact.cpp index 5739d96294..132b73c8ae 100644 --- a/protocols/MSN/src/msn_contact.cpp +++ b/protocols/MSN/src/msn_contact.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_errors.cpp b/protocols/MSN/src/msn_errors.cpp index ce18c956a3..177122d4e0 100644 --- a/protocols/MSN/src/msn_errors.cpp +++ b/protocols/MSN/src/msn_errors.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_ftold.cpp b/protocols/MSN/src/msn_ftold.cpp index d2cd516d33..db1ba3de66 100644 --- a/protocols/MSN/src/msn_ftold.cpp +++ b/protocols/MSN/src/msn_ftold.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_global.h b/protocols/MSN/src/msn_global.h index 4e5314b22a..327ce5b39d 100644 --- a/protocols/MSN/src/msn_global.h +++ b/protocols/MSN/src/msn_global.h @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2011 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_http.cpp b/protocols/MSN/src/msn_http.cpp index a01a78adbf..ae2f18cdf2 100644 --- a/protocols/MSN/src/msn_http.cpp +++ b/protocols/MSN/src/msn_http.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_libstr.cpp b/protocols/MSN/src/msn_libstr.cpp index 60e5918257..48296b36fb 100644 --- a/protocols/MSN/src/msn_libstr.cpp +++ b/protocols/MSN/src/msn_libstr.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_links.cpp b/protocols/MSN/src/msn_links.cpp index 6d170ca7c2..f6bc3e5f85 100644 --- a/protocols/MSN/src/msn_links.cpp +++ b/protocols/MSN/src/msn_links.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2008-2012 Boris Krasnovskiy.
This program is free software; you can redistribute it and/or
diff --git a/protocols/MSN/src/msn_lists.cpp b/protocols/MSN/src/msn_lists.cpp index c9a2d0e013..ad4098edd6 100644 --- a/protocols/MSN/src/msn_lists.cpp +++ b/protocols/MSN/src/msn_lists.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp index fe249ef45c..e095eb8856 100644 --- a/protocols/MSN/src/msn_mail.cpp +++ b/protocols/MSN/src/msn_mail.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2007-2012 Boris Krasnovskiy.
This program is free software; you can redistribute it and/or
diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp index 405c5da7dc..3bff6fdec8 100644 --- a/protocols/MSN/src/msn_menu.cpp +++ b/protocols/MSN/src/msn_menu.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_mime.cpp b/protocols/MSN/src/msn_mime.cpp index 2549927254..6f9d15d587 100644 --- a/protocols/MSN/src/msn_mime.cpp +++ b/protocols/MSN/src/msn_mime.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp index 3766d7d0b8..44db330f64 100644 --- a/protocols/MSN/src/msn_misc.cpp +++ b/protocols/MSN/src/msn_misc.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_msgqueue.cpp b/protocols/MSN/src/msn_msgqueue.cpp index 040ceedc72..894e4dee30 100644 --- a/protocols/MSN/src/msn_msgqueue.cpp +++ b/protocols/MSN/src/msn_msgqueue.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_msgsplit.cpp b/protocols/MSN/src/msn_msgsplit.cpp index ecd76b386a..ab0e3bb11d 100644 --- a/protocols/MSN/src/msn_msgsplit.cpp +++ b/protocols/MSN/src/msn_msgsplit.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2007-2012 Boris Krasnovskiy.
This program is free software; you can redistribute it and/or
diff --git a/protocols/MSN/src/msn_natdetect.cpp b/protocols/MSN/src/msn_natdetect.cpp index 77ef7f1adf..60a47a0895 100644 --- a/protocols/MSN/src/msn_natdetect.cpp +++ b/protocols/MSN/src/msn_natdetect.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2007-2012 Boris Krasnovskiy.
This program is free software; you can redistribute it and/or
diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp index 6f809e39d1..79139c3b23 100644 --- a/protocols/MSN/src/msn_opts.cpp +++ b/protocols/MSN/src/msn_opts.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_p2p.cpp b/protocols/MSN/src/msn_p2p.cpp index 43857f7483..faeee37d8b 100644 --- a/protocols/MSN/src/msn_p2p.cpp +++ b/protocols/MSN/src/msn_p2p.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_p2ps.cpp b/protocols/MSN/src/msn_p2ps.cpp index 1f2a3d9577..8c631aca5a 100644 --- a/protocols/MSN/src/msn_p2ps.cpp +++ b/protocols/MSN/src/msn_p2ps.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index 1ad594116f..0c492a34ae 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2008-2012 Boris Krasnovskiy.
This program is free software; you can redistribute it and/or
diff --git a/protocols/MSN/src/msn_proto.h b/protocols/MSN/src/msn_proto.h index 48c41d0fec..d581560dcd 100644 --- a/protocols/MSN/src/msn_proto.h +++ b/protocols/MSN/src/msn_proto.h @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2009-2012 Boris Krasnovskiy.
This program is free software; you can redistribute it and/or
diff --git a/protocols/MSN/src/msn_soapab.cpp b/protocols/MSN/src/msn_soapab.cpp index d072097b6b..d602d6d96d 100644 --- a/protocols/MSN/src/msn_soapab.cpp +++ b/protocols/MSN/src/msn_soapab.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2007-2012 Boris Krasnovskiy.
This program is free software; you can redistribute it and/or
diff --git a/protocols/MSN/src/msn_soapstore.cpp b/protocols/MSN/src/msn_soapstore.cpp index d0fffdc3d5..bc947a30ca 100644 --- a/protocols/MSN/src/msn_soapstore.cpp +++ b/protocols/MSN/src/msn_soapstore.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2007-2012 Boris Krasnovskiy.
This program is free software; you can redistribute it and/or
diff --git a/protocols/MSN/src/msn_srv.cpp b/protocols/MSN/src/msn_srv.cpp index 10b0d5a5dc..76c81b1263 100644 --- a/protocols/MSN/src/msn_srv.cpp +++ b/protocols/MSN/src/msn_srv.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_ssl.cpp b/protocols/MSN/src/msn_ssl.cpp index d88d3ee2f3..42b324655c 100644 --- a/protocols/MSN/src/msn_ssl.cpp +++ b/protocols/MSN/src/msn_ssl.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_std.cpp b/protocols/MSN/src/msn_std.cpp index 06f6d9c9eb..2917b8e05b 100644 --- a/protocols/MSN/src/msn_std.cpp +++ b/protocols/MSN/src/msn_std.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_svcs.cpp b/protocols/MSN/src/msn_svcs.cpp index 436fc36a79..518fd045a3 100644 --- a/protocols/MSN/src/msn_svcs.cpp +++ b/protocols/MSN/src/msn_svcs.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_switchboard.cpp b/protocols/MSN/src/msn_switchboard.cpp index c7777c25a4..95f07482ec 100644 --- a/protocols/MSN/src/msn_switchboard.cpp +++ b/protocols/MSN/src/msn_switchboard.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_threads.cpp b/protocols/MSN/src/msn_threads.cpp index 72690d3bc0..41c67ad031 100644 --- a/protocols/MSN/src/msn_threads.cpp +++ b/protocols/MSN/src/msn_threads.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/msn_ws.cpp b/protocols/MSN/src/msn_ws.cpp index 98d89698a2..1cd3e04c2b 100644 --- a/protocols/MSN/src/msn_ws.cpp +++ b/protocols/MSN/src/msn_ws.cpp @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2006-2012 Boris Krasnovskiy.
Copyright (c) 2003-2005 George Hazan.
Copyright (c) 2002-2003 Richard Hughes (original version).
diff --git a/protocols/MSN/src/stdafx.cpp b/protocols/MSN/src/stdafx.cpp index 6a827b56bd..01a3153a4d 100644 --- a/protocols/MSN/src/stdafx.cpp +++ b/protocols/MSN/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-2013 Miranda NG team (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG team (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/MSN/src/version.h b/protocols/MSN/src/version.h index e61506d097..07d00b7ca6 100644 --- a/protocols/MSN/src/version.h +++ b/protocols/MSN/src/version.h @@ -1,7 +1,7 @@ /*
Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-Copyright (c) 2012-2013 Miranda NG Team
+Copyright (c) 2012-2014 Miranda NG Team
Copyright (c) 2008-2009 Boris Krasnovskiy.
This program is free software; you can redistribute it and/or
diff --git a/protocols/Omegle/src/stdafx.cpp b/protocols/Omegle/src/stdafx.cpp index 1976d867da..2aa7ce281e 100644 --- a/protocols/Omegle/src/stdafx.cpp +++ b/protocols/Omegle/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/Skype/src/version.h b/protocols/Skype/src/version.h index ff96917ab7..61bf7c10ba 100644 --- a/protocols/Skype/src/version.h +++ b/protocols/Skype/src/version.h @@ -17,4 +17,4 @@ #define __AUTHOR "unsane, mataes, ghazan"
#define __AUTHOREMAIL "mataes2007@gmail.com"
#define __AUTHORWEB "http://miranda-ng.org/p/Skype/"
-#define __COPYRIGHT "© 2012-2013 Miranda NG team"
+#define __COPYRIGHT "© 2012-14 Miranda NG team"
diff --git a/protocols/VKontakte/src/main.cpp b/protocols/VKontakte/src/main.cpp index 5264952384..87a9bda6a5 100644 --- a/protocols/VKontakte/src/main.cpp +++ b/protocols/VKontakte/src/main.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2013 Miranda NG Project (http://miranda-ng.org)
+Copyright (c) 2013-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp index db2b2654d5..b687f7fd16 100644 --- a/protocols/VKontakte/src/misc.cpp +++ b/protocols/VKontakte/src/misc.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2013 Miranda NG Project (http://miranda-ng.org)
+Copyright (c) 2013-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/VKontakte/src/stdafx.cpp b/protocols/VKontakte/src/stdafx.cpp index d788c2781d..7658a52c43 100644 --- a/protocols/VKontakte/src/stdafx.cpp +++ b/protocols/VKontakte/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2013 Miranda NG Project (http://miranda-ng.org)
+Copyright (c) 2013-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/VKontakte/src/stdafx.h b/protocols/VKontakte/src/stdafx.h index 876fd93ab1..ff37ff59a3 100644 --- a/protocols/VKontakte/src/stdafx.h +++ b/protocols/VKontakte/src/stdafx.h @@ -1,5 +1,5 @@ /*
-Copyright (C) 2013 Miranda NG Project (http://miranda-ng.org)
+Copyright (c) 2013-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/VKontakte/src/version.h b/protocols/VKontakte/src/version.h index d7946b1520..c4e6849449 100644 --- a/protocols/VKontakte/src/version.h +++ b/protocols/VKontakte/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG Team"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "http://miranda-ng.org/p/VKontakte/"
-#define __COPYRIGHT "© 2013 Miranda NG Team"
+#define __COPYRIGHT "© 2013-14 Miranda NG Team"
diff --git a/protocols/VKontakte/src/vk.h b/protocols/VKontakte/src/vk.h index 2e77dfe03e..9550262153 100644 --- a/protocols/VKontakte/src/vk.h +++ b/protocols/VKontakte/src/vk.h @@ -1,5 +1,5 @@ /*
-Copyright (C) 2013 Miranda NG Project (http://miranda-ng.org)
+Copyright (c) 2013-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/VKontakte/src/vk_avatars.cpp b/protocols/VKontakte/src/vk_avatars.cpp index de57881152..f97fb430e5 100644 --- a/protocols/VKontakte/src/vk_avatars.cpp +++ b/protocols/VKontakte/src/vk_avatars.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2013 Miranda NG Project (http://miranda-ng.org)
+Copyright (c) 2013-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/VKontakte/src/vk_captcha.cpp b/protocols/VKontakte/src/vk_captcha.cpp index 9ff3cdfde6..3196082882 100644 --- a/protocols/VKontakte/src/vk_captcha.cpp +++ b/protocols/VKontakte/src/vk_captcha.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2013 Miranda NG Project (http://miranda-ng.org)
+Copyright (c) 2013-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp index 2cd9558fa9..3ce73d7f72 100644 --- a/protocols/VKontakte/src/vk_options.cpp +++ b/protocols/VKontakte/src/vk_options.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2013 Miranda NG Project (http://miranda-ng.org)
+Copyright (c) 2013-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index ad8e5fa39a..1d45da95fe 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2013 Miranda NG Project (http://miranda-ng.org)
+Copyright (c) 2013-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/VKontakte/src/vk_proto.h b/protocols/VKontakte/src/vk_proto.h index 84a145ad05..12e6bd710b 100644 --- a/protocols/VKontakte/src/vk_proto.h +++ b/protocols/VKontakte/src/vk_proto.h @@ -1,5 +1,5 @@ /*
-Copyright (C) 2013 Miranda NG Project (http://miranda-ng.org)
+Copyright (c) 2013-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/VKontakte/src/vk_queue.cpp b/protocols/VKontakte/src/vk_queue.cpp index f110626011..b3ee1e9195 100644 --- a/protocols/VKontakte/src/vk_queue.cpp +++ b/protocols/VKontakte/src/vk_queue.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2013 Miranda NG Project (http://miranda-ng.org)
+Copyright (c) 2013-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp index 7ef08b4b6e..088201e450 100644 --- a/protocols/VKontakte/src/vk_thread.cpp +++ b/protocols/VKontakte/src/vk_thread.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2013 Miranda NG Project (http://miranda-ng.org)
+Copyright (c) 2013-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/WhatsApp/src/common.h b/protocols/WhatsApp/src/common.h index 0b65ba4f9f..8c998ecb61 100644 --- a/protocols/WhatsApp/src/common.h +++ b/protocols/WhatsApp/src/common.h @@ -1,7 +1,7 @@ /*
WhatsApp plugin for Miranda NG
-Copyright © 2013 Uli Hecht
+Copyright © 2013-14 Uli Hecht
*/
diff --git a/protocols/WhatsApp/src/main.cpp b/protocols/WhatsApp/src/main.cpp index e715d37a39..63834058f7 100644 --- a/protocols/WhatsApp/src/main.cpp +++ b/protocols/WhatsApp/src/main.cpp @@ -14,7 +14,7 @@ PLUGININFOEX pluginInfo = { "Provides basic support for WhatsApp.",
"Uli Hecht",
"uli.hecht@gmail.com",
- "© 2013 Uli Hecht",
+ "© 2013-14 Uli Hecht",
"http://example.com",
UNICODE_AWARE, //not transient
// {4f1ff7fa-4d75-44b9-93b0-2ced2e4f9e3e}
@@ -42,7 +42,7 @@ BOOL IsRunAsAdmin() goto Cleanup;
}
- // Determine whether the SID of administrators group is enabled in
+ // Determine whether the SID of administrators group is enabled in
// the primary access token of the process.
if ( !CheckTokenMembership(NULL, pAdministratorsGroup, &fIsRunAsAdmin))
{
@@ -217,7 +217,7 @@ extern "C" int __declspec(dllexport) Load(void) pd.fnInit = protoInit;
pd.fnUninit = protoUninit;
CallService(MS_PROTO_REGISTERMODULE,0,reinterpret_cast<LPARAM>(&pd));
-
+
InitIcons();
//InitContactMenus();
diff --git a/protocols/WhatsApp/src/version.h b/protocols/WhatsApp/src/version.h index 9146119e20..c98b0f9c6b 100644 --- a/protocols/WhatsApp/src/version.h +++ b/protocols/WhatsApp/src/version.h @@ -13,4 +13,4 @@ #define __AUTHOR "Uli Hecht"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "http://miranda-ng.org/p/WhatsApp/"
-#define __COPYRIGHT "© 2013 Uli Hecht"
+#define __COPYRIGHT "© 2013-14 Uli Hecht"
diff --git a/protocols/Yahoo/src/stdafx.cpp b/protocols/Yahoo/src/stdafx.cpp index 17fece6f85..8e3b5a03b7 100644 --- a/protocols/Yahoo/src/stdafx.cpp +++ b/protocols/Yahoo/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/core/commonheaders.h b/src/core/commonheaders.h index e1e4ef2544..482bab7f2d 100644 --- a/src/core/commonheaders.h +++ b/src/core/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index b043bd450d..45947ea0ad 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/src/core/miranda.cpp b/src/core/miranda.cpp index 522843e919..cf6dec614e 100644 --- a/src/core/miranda.cpp +++ b/src/core/miranda.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -246,7 +247,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR cmdLine, int) CreateServiceFunction(MS_SYSTEM_GETIDLE, SystemGetIdle);
dwEventTime = GetTickCount();
DWORD myPid = GetCurrentProcessId();
-
+
bool messageloop = true;
while (messageloop) {
MSG msg;
diff --git a/src/core/miranda.h b/src/core/miranda.h index 044b16f38c..fffbbbf689 100644 --- a/src/core/miranda.h +++ b/src/core/miranda.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/src/core/modules.cpp b/src/core/modules.cpp index 14672ff796..e90d18941d 100644 --- a/src/core/modules.cpp +++ b/src/core/modules.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -124,7 +125,7 @@ int LoadDefaultModules(void) case SERVICE_CONTINUE: // continue loading Miranda normally
break;
case SERVICE_ONLYDB: // load database and go to the message cycle
- return 0;
+ return 0;
case SERVICE_MONOPOLY: // unload database and go to the message cycle
UnloadDatabase();
return 0;
diff --git a/src/core/modules.h b/src/core/modules.h index 3bb9f1c1f5..cc03e0c2b9 100644 --- a/src/core/modules.h +++ b/src/core/modules.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -197,7 +198,7 @@ serviceProc is defined by the caller as where fnParam does not need to be publicly known. Gives the ability to handle multiple services
with the same function.
-added during 0.7+ (2007/04/24)
+added during 0.7+ (2007/04/24)
*/
HANDLE CreateServiceFunctionParam(const char *name, MIRANDASERVICEPARAM serviceProc, LPARAM lParam);
@@ -209,7 +210,7 @@ serviceProc is defined by the caller as where fnParam does not need to be publicly known. Gives the ability to handle multiple services
with the same function.
-added during 0.7+ (2007/04/24)
+added during 0.7+ (2007/04/24)
*/
HANDLE CreateServiceFunctionObj(const char *name, MIRANDASERVICEOBJ serviceProc, void* object);
diff --git a/src/core/stdafx.cpp b/src/core/stdafx.cpp index 838b101bd3..df76ee5802 100644 --- a/src/core/stdafx.cpp +++ b/src/core/stdafx.cpp @@ -1,6 +1,6 @@ /*
-Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG team (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/core/stdauth/auth.cpp b/src/core/stdauth/auth.cpp index 7f349ede03..f02278e81b 100644 --- a/src/core/stdauth/auth.cpp +++ b/src/core/stdauth/auth.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdauth/authdialogs.cpp b/src/core/stdauth/authdialogs.cpp index b366b3956c..900de05b61 100644 --- a/src/core/stdauth/authdialogs.cpp +++ b/src/core/stdauth/authdialogs.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -103,7 +104,7 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDC_ADD:
- {
+ {
ADDCONTACTSTRUCT acs = {0};
acs.handle = hDbEvent;
acs.handleType = HANDLE_EVENT;
@@ -123,7 +124,7 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar }
case IDOK:
- {
+ {
ADDCONTACTSTRUCT acs = {0};
acs.handle = hDbEvent;
acs.handleType = HANDLE_EVENT;
@@ -242,7 +243,7 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP break;
case IDOK:
- {
+ {
DBEVENTINFO dbei = { sizeof(dbei) };
db_event_get(hDbEvent, &dbei);
CallProtoService(dbei.szModule, PS_AUTHALLOW, (WPARAM)hDbEvent, 0);
diff --git a/src/core/stdauth/commonheaders.h b/src/core/stdauth/commonheaders.h index 137fd055f5..b40dc69020 100644 --- a/src/core/stdauth/commonheaders.h +++ b/src/core/stdauth/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdautoaway/autoaway.cpp b/src/core/stdautoaway/autoaway.cpp index a96c788c48..94980f4368 100644 --- a/src/core/stdautoaway/autoaway.cpp +++ b/src/core/stdautoaway/autoaway.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdautoaway/commonheaders.h b/src/core/stdautoaway/commonheaders.h index 606d854a34..413fa3430d 100644 --- a/src/core/stdautoaway/commonheaders.h +++ b/src/core/stdautoaway/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdaway/awaymsg.cpp b/src/core/stdaway/awaymsg.cpp index 4abc781f50..08d841275c 100644 --- a/src/core/stdaway/awaymsg.cpp +++ b/src/core/stdaway/awaymsg.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -165,7 +166,7 @@ int LoadAwayMsgModule(void) {
hWindowList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0);
CreateServiceFunction(MS_AWAYMSG_SHOWAWAYMSG, GetMessageCommand);
-
+
CLISTMENUITEM mi = { sizeof(mi) };
mi.position = -2000005000;
mi.flags = CMIF_NOTOFFLINE;
diff --git a/src/core/stdaway/commonheaders.h b/src/core/stdaway/commonheaders.h index 1423bafc37..002b2bad4d 100644 --- a/src/core/stdaway/commonheaders.h +++ b/src/core/stdaway/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdaway/sendmsg.cpp b/src/core/stdaway/sendmsg.cpp index 0c9f1743ce..c05a65b822 100644 --- a/src/core/stdaway/sendmsg.cpp +++ b/src/core/stdaway/sendmsg.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -59,7 +60,7 @@ static const char *StatusModeToDbSetting(int status, const char *suffix) const char *prefix;
static char str[64];
- switch(status)
+ switch(status)
{
case ID_STATUS_AWAY: prefix = "Away"; break;
case ID_STATUS_NA: prefix = "Na"; break;
@@ -191,7 +192,7 @@ void ChangeAllProtoMessages(char *szProto, int statusMode, TCHAR *msg) {
PROTOACCOUNT* pa = accounts[i];
if ( !Proto_IsAccountEnabled(pa)) continue;
- if ((CallProtoService(pa->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND) &&
+ if ((CallProtoService(pa->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND) &&
!Proto_IsAccountLocked(pa))
CallProtoService(pa->szModuleName, PS_SETAWAYMSGT, statusMode, (LPARAM)msg);
}
@@ -219,7 +220,7 @@ struct SetAwasMsgNewData static INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
SetAwayMsgData* dat = (SetAwayMsgData*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
-
+
switch(message) {
case WM_INITDIALOG:
{
@@ -350,13 +351,13 @@ static int StatusModeChange(WPARAM wParam, LPARAM lParam) newdat->statusMode = statusMode;
if (hwndStatusMsg)
DestroyWindow(hwndStatusMsg);
- hwndStatusMsg = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SETAWAYMSG),
+ hwndStatusMsg = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SETAWAYMSG),
NULL, SetAwayMsgDlgProc, (LPARAM)newdat);
}
return 0;
}
-static const int statusModes[] =
+static const int statusModes[] =
{
ID_STATUS_OFFLINE, ID_STATUS_ONLINE, ID_STATUS_AWAY, ID_STATUS_NA, ID_STATUS_OCCUPIED, ID_STATUS_DND,
ID_STATUS_FREECHAT, ID_STATUS_INVISIBLE, ID_STATUS_OUTTOLUNCH, ID_STATUS_ONTHEPHONE, ID_STATUS_IDLE
@@ -507,7 +508,7 @@ static INT_PTR CALLBACK DlgProcAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam int i = hLst ? (SendDlgItemMessage(hwndDlg, IDC_LST_STATUS, LB_GETCOUNT, 0, 0) - 1) :
(SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_GETCOUNT, 0, 0) - 1);
for (; i >= 0; i--) {
- int status = hLst ?
+ int status = hLst ?
SendDlgItemMessage(hwndDlg, IDC_LST_STATUS, LB_GETITEMDATA, i, 0):
SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_GETITEMDATA, i, 0);
SetStatusModeByte(status, "Ignore", (BYTE)dat->info[i].ignore);
@@ -551,7 +552,7 @@ static int AwayMsgSendModernOptInit(WPARAM wParam, LPARAM) if (protoModeMsgFlags == 0)
return 0;
- static const int iBoldControls[] =
+ static const int iBoldControls[] =
{
IDC_TXT_TITLE1, IDC_TXT_TITLE2, IDC_TXT_TITLE3,
MODERNOPT_CTRL_LAST
diff --git a/src/core/stdchat/src/manager.cpp b/src/core/stdchat/src/manager.cpp index cb8b4ae096..2437cd64db 100644 --- a/src/core/stdchat/src/manager.cpp +++ b/src/core/stdchat/src/manager.cpp @@ -1,7 +1,7 @@ /*
Chat module plugin for Miranda IM
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdchat/src/services.cpp b/src/core/stdchat/src/services.cpp index fa9a5f8a01..b222f17c95 100644 --- a/src/core/stdchat/src/services.cpp +++ b/src/core/stdchat/src/services.cpp @@ -1,7 +1,7 @@ /*
Chat module plugin for Miranda IM
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdchat/src/stdafx.cpp b/src/core/stdchat/src/stdafx.cpp index 61be01dd37..c4bc031b5b 100644 --- a/src/core/stdchat/src/stdafx.cpp +++ b/src/core/stdchat/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG team (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/core/stdchat/src/tools.cpp b/src/core/stdchat/src/tools.cpp index 771b2c623c..3d4bbb0ba1 100644 --- a/src/core/stdchat/src/tools.cpp +++ b/src/core/stdchat/src/tools.cpp @@ -1,7 +1,7 @@ /*
Chat module plugin for Miranda IM
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp index aaae35930c..9c343c9d60 100644 --- a/src/core/stdchat/src/window.cpp +++ b/src/core/stdchat/src/window.cpp @@ -1,7 +1,7 @@ /*
Chat module plugin for Miranda IM
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdclist/src/clc.h b/src/core/stdclist/src/clc.h index 39f357d4c9..070cd43854 100644 --- a/src/core/stdclist/src/clc.h +++ b/src/core/stdclist/src/clc.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdclist/src/clcfonts.cpp b/src/core/stdclist/src/clcfonts.cpp index 1dc3fedc90..9a8742f654 100644 --- a/src/core/stdclist/src/clcfonts.cpp +++ b/src/core/stdclist/src/clcfonts.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp index 009efe13c2..f346fd29f3 100644 --- a/src/core/stdclist/src/clcopts.cpp +++ b/src/core/stdclist/src/clcopts.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -114,7 +115,7 @@ static DWORD MakeCheckBoxTreeFlags(HWND hwndTree) return flags;
}
-static LONG CalcMinRowHeight()
+static LONG CalcMinRowHeight()
{
int i;
LONG minHeight = 16;
@@ -129,7 +130,7 @@ static LONG CalcMinRowHeight() hFont = CreateFontIndirect(&lf);
hFont = ( HFONT )SelectObject(hdc, hFont);
GetTextExtentPoint32(hdc, _T("x"), 1, &fontSize);
- if (fontSize.cy > minHeight)
+ if (fontSize.cy > minHeight)
minHeight = fontSize.cy;
hFont = ( HFONT )SelectObject(hdc,hFont);
DeleteObject(hFont);
@@ -182,7 +183,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam {
LONG minHeight = CalcMinRowHeight();
LONG rowHeight = db_get_b(NULL, "CLC", "RowHeight", CLCDEFAULT_ROWHEIGHT);
- if (rowHeight < minHeight) {
+ if (rowHeight < minHeight) {
rowHeight = minHeight;
}
SendDlgItemMessage(hwndDlg, IDC_ROWHEIGHTSPIN, UDM_SETRANGE, 0, MAKELONG(255, minHeight));
@@ -193,7 +194,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam {
LONG minHeight = CalcMinRowHeight();
LONG rowHeight = SendDlgItemMessage(hwndDlg, IDC_ROWHEIGHTSPIN, UDM_GETPOS, 0, 0);
- if (rowHeight < minHeight) {
+ if (rowHeight < minHeight) {
rowHeight = minHeight;
SendDlgItemMessage(hwndDlg, IDC_ROWHEIGHTSPIN, UDM_SETPOS, 0, MAKELONG(rowHeight, 0));
}
@@ -208,7 +209,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam EnableWindow(GetDlgItem(hwndDlg, IDC_SMOOTHTIME), IsDlgButtonChecked(hwndDlg, IDC_NOTNOSMOOTHSCROLLING));
if (LOWORD(wParam) == IDC_GREYOUT)
EnableWindow(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS), IsDlgButtonChecked(hwndDlg, IDC_GREYOUT));
- if ((LOWORD(wParam) == IDC_LEFTMARGIN || LOWORD(wParam) == IDC_SMOOTHTIME || LOWORD(wParam) == IDC_GROUPINDENT
+ if ((LOWORD(wParam) == IDC_LEFTMARGIN || LOWORD(wParam) == IDC_SMOOTHTIME || LOWORD(wParam) == IDC_GROUPINDENT
|| LOWORD(wParam) == IDC_ROWHEIGHT)
&& (HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus()))
return 0;
diff --git a/src/core/stdclist/src/clcpaint.cpp b/src/core/stdclist/src/clcpaint.cpp index 5b6b55f467..3bfb0597b2 100644 --- a/src/core/stdclist/src/clcpaint.cpp +++ b/src/core/stdclist/src/clcpaint.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdclist/src/clistmenus.cpp b/src/core/stdclist/src/clistmenus.cpp index 9d736873b4..456771fd40 100644 --- a/src/core/stdclist/src/clistmenus.cpp +++ b/src/core/stdclist/src/clistmenus.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp index 10c71965c3..f933ac01cb 100644 --- a/src/core/stdclist/src/clistopts.cpp +++ b/src/core/stdclist/src/clistopts.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -138,7 +139,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP }
if (-1 == (int) SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0))
SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETCURSEL, 0, 0);
- SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETBUDDY, (WPARAM) GetDlgItem(hwndDlg, IDC_BLINKTIME), 0); // set buddy
+ SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETBUDDY, (WPARAM) GetDlgItem(hwndDlg, IDC_BLINKTIME), 0); // set buddy
SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETRANGE, 0, MAKELONG(0x3FFF, 250));
SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(NULL, "CList", "IconFlashTime", 550), 0));
return TRUE;
@@ -214,7 +215,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP PROTOACCOUNT* pa = ( PROTOACCOUNT* )SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cur, 0 );
if ( pa == NULL )
db_unset(NULL, "CList", "PrimaryStatus");
- else
+ else
db_set_s(NULL, "CList", "PrimaryStatus", pa->szModuleName );
}
diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp index 5921e81740..8921fbd59e 100644 --- a/src/core/stdclist/src/cluiopts.cpp +++ b/src/core/stdclist/src/cluiopts.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdclist/src/commonheaders.h b/src/core/stdclist/src/commonheaders.h index 760b9b09b8..45828cfa1b 100644 --- a/src/core/stdclist/src/commonheaders.h +++ b/src/core/stdclist/src/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdclist/src/init.cpp b/src/core/stdclist/src/init.cpp index f751d9b853..7ec9cfebc4 100644 --- a/src/core/stdclist/src/init.cpp +++ b/src/core/stdclist/src/init.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdclist/src/stdafx.cpp b/src/core/stdclist/src/stdafx.cpp index 270c270550..9c953189b2 100644 --- a/src/core/stdclist/src/stdafx.cpp +++ b/src/core/stdclist/src/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG team (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/core/stdcrypt/commonheaders.h b/src/core/stdcrypt/commonheaders.h index 07daa68ac1..2ad7031f79 100644 --- a/src/core/stdcrypt/commonheaders.h +++ b/src/core/stdcrypt/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdcrypt/encrypt.cpp b/src/core/stdcrypt/encrypt.cpp index b4bdae7e01..c08ec19529 100644 --- a/src/core/stdcrypt/encrypt.cpp +++ b/src/core/stdcrypt/encrypt.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-13 Miranda NG project,
+Copyright (C) 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdcrypt/utils.cpp b/src/core/stdcrypt/utils.cpp index 99b2d3c8db..85f6eb53b1 100644 --- a/src/core/stdcrypt/utils.cpp +++ b/src/core/stdcrypt/utils.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-13 Miranda NG project,
+Copyright (C) 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdcrypt/version.h b/src/core/stdcrypt/version.h index e55d85129c..1542c74042 100644 --- a/src/core/stdcrypt/version.h +++ b/src/core/stdcrypt/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG Development Team"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "http://miranda-ng.org/p/StdCrypt/"
-#define __COPYRIGHT "© 2012-13 Miranda NG Development Team"
+#define __COPYRIGHT "© 2012-14 Miranda NG Development Team"
diff --git a/src/core/stdemail/commonheaders.h b/src/core/stdemail/commonheaders.h index 40ae60a779..f027e47929 100644 --- a/src/core/stdemail/commonheaders.h +++ b/src/core/stdemail/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdemail/email.cpp b/src/core/stdemail/email.cpp index 3d8ffc470c..12296eeda3 100644 --- a/src/core/stdemail/email.cpp +++ b/src/core/stdemail/email.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/src/core/stdfile/commonheaders.h b/src/core/stdfile/commonheaders.h index 70a1378387..f3600efc5e 100644 --- a/src/core/stdfile/commonheaders.h +++ b/src/core/stdfile/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdfile/file.cpp b/src/core/stdfile/file.cpp index 90c2a5e0f3..217605b18f 100644 --- a/src/core/stdfile/file.cpp +++ b/src/core/stdfile/file.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/src/core/stdfile/file.h b/src/core/stdfile/file.h index 95e2eb4818..80f8b26d2b 100644 --- a/src/core/stdfile/file.h +++ b/src/core/stdfile/file.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/src/core/stdfile/fileexistsdlg.cpp b/src/core/stdfile/fileexistsdlg.cpp index c9c36e2f5b..72930fe482 100644 --- a/src/core/stdfile/fileexistsdlg.cpp +++ b/src/core/stdfile/fileexistsdlg.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -52,7 +53,7 @@ static void DoAnnoyingShellCommand(HWND hwnd, const TCHAR *szFilename, int cmd, if (SHGetDesktopFolder(&pDesktopFolder) == NOERROR) {
ITEMIDLIST *pCurrentIdl;
WCHAR* wszFilename = (LPWSTR)szFilename;
-
+
if (pDesktopFolder->ParseDisplayName(NULL, NULL, wszFilename, NULL, &pCurrentIdl, NULL) == NOERROR) {
if (pCurrentIdl->mkid.cb) {
ITEMIDLIST *pidl, *pidlNext, *pidlFilename;
@@ -223,13 +224,13 @@ INT_PTR CALLBACK DlgProcFileExists(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lisi->hwndDlg = hwndDlg;
lisi->szFilename = mir_tstrdup(fts->tszCurrentFile);
//can be a little slow, so why not?
- forkthread(LoadIconsAndTypesThread, 0, lisi);
+ forkthread(LoadIconsAndTypesThread, 0, lisi);
SetFocus(hwndFocus);
SetWindowLongPtr(hwndFocus, GWL_STYLE, GetWindowLongPtr(hwndFocus, GWL_STYLE)|BS_DEFPUSHBUTTON);
return FALSE;
}
case WM_COMMAND:
- {
+ {
PROTOFILERESUME pfr = {0};
switch(LOWORD(wParam)) {
case IDC_OPENFILE:
@@ -237,7 +238,7 @@ INT_PTR CALLBACK DlgProcFileExists(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM return FALSE;
case IDC_OPENFOLDER:
- {
+ {
TCHAR szFile[MAX_PATH];
lstrcpyn(szFile, fts->tszCurrentFile, SIZEOF(szFile));
TCHAR *pszLastBackslash = _tcsrchr(szFile, '\\');
@@ -267,7 +268,7 @@ INT_PTR CALLBACK DlgProcFileExists(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM break;
case IDC_SAVEAS:
- {
+ {
OPENFILENAME ofn = {0};
TCHAR filter[512], *pfilter;
TCHAR str[MAX_PATH];
diff --git a/src/core/stdfile/fileopts.cpp b/src/core/stdfile/fileopts.cpp index 5cf5c284da..95a73b4455 100644 --- a/src/core/stdfile/fileopts.cpp +++ b/src/core/stdfile/fileopts.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -36,16 +37,16 @@ struct virusscannerinfo { };
static const struct virusscannerinfo virusScanners[] = {
- {_T("Network Associates/McAfee VirusScan"), _T("SOFTWARE\\McAfee\\VirusScan"), _T("Scan32EXE"), _T("\"%s\" %%f /nosplash /comp /autoscan /autoexit /noboot")},
- {_T("Dr Solomon's VirusScan (Network Associates)"), _T("SOFTWARE\\Network Associates\\TVD\\VirusScan\\AVConsol\\General"), _T("szScannerExe"), _T("\"%s\" %%f /uinone /noboot /comp /prompt /autoexit")},
- {_T("Norton AntiVirus"), _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\Navw32.exe"), NULL, _T("\"%s\" %%f /b- /m- /s+ /noresults")},
- {_T("Computer Associates/Inoculate IT"), _T("Software\\Antivirus"), _T("ImageFilename"), _T("\"%s\" %%f /display = progress /exit")},
- {_T("Computer Associates eTrust"), _T("SOFTWARE\\ComputerAssociates\\Anti-Virus\\Resident"), _T("VetPath"), _T("\"%s\" %%f /display = progress /exit")},
- {_T("Kaspersky Anti-Virus"), _T("SOFTWARE\\KasperskyLab\\Components\\101"), _T("EXEName"), _T("\"%s\" /S /Q %%f")},
- {_T("Kaspersky Anti-Virus"), _T("SOFTWARE\\KasperskyLab\\SetupFolders"), _T("KAV8"), _T("\"%savp.exe\" SCAN %%f")},
- {_T("Kaspersky Anti-Virus"), _T("SOFTWARE\\KasperskyLab\\SetupFolders"), _T("KAV9"), _T("\"%savp.exe\" SCAN %%f")},
- {_T("AntiVir PersonalEdition Classic"), _T("SOFTWARE\\Avira\\AntiVir PersonalEdition Classic"), _T("Path"), _T("\"%savscan.exe\" /GUIMODE = 2 /PATH = \"%%f\"")},
- {_T("ESET NOD32 Antivirus"), _T("SOFTWARE\\ESET\\ESET Security\\CurrentVersion\\Info"), _T("InstallDir"), _T("\"%secls.exe\" /log-all /aind /no-boots /adware /sfx /unsafe /unwanted /heur /adv-heur /action = clean \"%%f\"")},
+ {_T("Network Associates/McAfee VirusScan"), _T("SOFTWARE\\McAfee\\VirusScan"), _T("Scan32EXE"), _T("\"%s\" %%f /nosplash /comp /autoscan /autoexit /noboot")},
+ {_T("Dr Solomon's VirusScan (Network Associates)"), _T("SOFTWARE\\Network Associates\\TVD\\VirusScan\\AVConsol\\General"), _T("szScannerExe"), _T("\"%s\" %%f /uinone /noboot /comp /prompt /autoexit")},
+ {_T("Norton AntiVirus"), _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\Navw32.exe"), NULL, _T("\"%s\" %%f /b- /m- /s+ /noresults")},
+ {_T("Computer Associates/Inoculate IT"), _T("Software\\Antivirus"), _T("ImageFilename"), _T("\"%s\" %%f /display = progress /exit")},
+ {_T("Computer Associates eTrust"), _T("SOFTWARE\\ComputerAssociates\\Anti-Virus\\Resident"), _T("VetPath"), _T("\"%s\" %%f /display = progress /exit")},
+ {_T("Kaspersky Anti-Virus"), _T("SOFTWARE\\KasperskyLab\\Components\\101"), _T("EXEName"), _T("\"%s\" /S /Q %%f")},
+ {_T("Kaspersky Anti-Virus"), _T("SOFTWARE\\KasperskyLab\\SetupFolders"), _T("KAV8"), _T("\"%savp.exe\" SCAN %%f")},
+ {_T("Kaspersky Anti-Virus"), _T("SOFTWARE\\KasperskyLab\\SetupFolders"), _T("KAV9"), _T("\"%savp.exe\" SCAN %%f")},
+ {_T("AntiVir PersonalEdition Classic"), _T("SOFTWARE\\Avira\\AntiVir PersonalEdition Classic"), _T("Path"), _T("\"%savscan.exe\" /GUIMODE = 2 /PATH = \"%%f\"")},
+ {_T("ESET NOD32 Antivirus"), _T("SOFTWARE\\ESET\\ESET Security\\CurrentVersion\\Info"), _T("InstallDir"), _T("\"%secls.exe\" /log-all /aind /no-boots /adware /sfx /unsafe /unwanted /heur /adv-heur /action = clean \"%%f\"")},
};
#define M_UPDATEENABLING (WM_USER+100)
@@ -241,4 +242,3 @@ int FileOptInitialise(WPARAM wParam, LPARAM) Options_AddPage(wParam, &odp);
return 0;
}
-
diff --git a/src/core/stdfile/filerecvdlg.cpp b/src/core/stdfile/filerecvdlg.cpp index c592388e04..a5c230cbb2 100644 --- a/src/core/stdfile/filerecvdlg.cpp +++ b/src/core/stdfile/filerecvdlg.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdfile/filesenddlg.cpp b/src/core/stdfile/filesenddlg.cpp index 3b2cf8f3c5..f56907c99b 100644 --- a/src/core/stdfile/filesenddlg.cpp +++ b/src/core/stdfile/filesenddlg.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdfile/filexferdlg.cpp b/src/core/stdfile/filexferdlg.cpp index e7a0d392f4..e6e303871c 100644 --- a/src/core/stdfile/filexferdlg.cpp +++ b/src/core/stdfile/filexferdlg.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdfile/ftmanager.cpp b/src/core/stdfile/ftmanager.cpp index 65b74a75fc..df7ce4a72a 100644 --- a/src/core/stdfile/ftmanager.cpp +++ b/src/core/stdfile/ftmanager.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdhelp/about.cpp b/src/core/stdhelp/about.cpp index 47226db9d0..1bc32b96f2 100644 --- a/src/core/stdhelp/about.cpp +++ b/src/core/stdhelp/about.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdhelp/commonheaders.h b/src/core/stdhelp/commonheaders.h index a8303efdaa..ca154ba24b 100644 --- a/src/core/stdhelp/commonheaders.h +++ b/src/core/stdhelp/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdhelp/help.cpp b/src/core/stdhelp/help.cpp index 376b5b7ff3..7f7f449ae0 100644 --- a/src/core/stdhelp/help.cpp +++ b/src/core/stdhelp/help.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdidle/commonheaders.h b/src/core/stdidle/commonheaders.h index 3ee34d7e8a..77faadcfe7 100644 --- a/src/core/stdidle/commonheaders.h +++ b/src/core/stdidle/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdidle/idle.cpp b/src/core/stdidle/idle.cpp index 50a41dd7ae..92a53a5deb 100644 --- a/src/core/stdidle/idle.cpp +++ b/src/core/stdidle/idle.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdmsg/src/cmdlist.cpp b/src/core/stdmsg/src/cmdlist.cpp index 3a43f4ef8d..ebeb98519f 100644 --- a/src/core/stdmsg/src/cmdlist.cpp +++ b/src/core/stdmsg/src/cmdlist.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdmsg/src/cmdlist.h b/src/core/stdmsg/src/cmdlist.h index c57499c0bc..5f9db21b50 100644 --- a/src/core/stdmsg/src/cmdlist.h +++ b/src/core/stdmsg/src/cmdlist.h @@ -1,6 +1,6 @@ /*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdmsg/src/commonheaders.h b/src/core/stdmsg/src/commonheaders.h index 35e9fe6031..68c2d753a0 100644 --- a/src/core/stdmsg/src/commonheaders.h +++ b/src/core/stdmsg/src/commonheaders.h @@ -1,6 +1,6 @@ /*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdmsg/src/globals.cpp b/src/core/stdmsg/src/globals.cpp index 56c2b83c87..d0b991a688 100644 --- a/src/core/stdmsg/src/globals.cpp +++ b/src/core/stdmsg/src/globals.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdmsg/src/globals.h b/src/core/stdmsg/src/globals.h index 064db8eb6d..f2d7f6752c 100644 --- a/src/core/stdmsg/src/globals.h +++ b/src/core/stdmsg/src/globals.h @@ -1,6 +1,6 @@ /*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index c17ecab0be..19a0dc01dd 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp index c18fe893a9..78229431f3 100644 --- a/src/core/stdmsg/src/msglog.cpp +++ b/src/core/stdmsg/src/msglog.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 747b5d1872..eee8d6f2ac 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 5fc1fec3f4..31f68d4c9d 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h index b3cfc3bf92..1a75b19b1b 100644 --- a/src/core/stdmsg/src/msgs.h +++ b/src/core/stdmsg/src/msgs.h @@ -1,6 +1,6 @@ /*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdmsg/src/msgtimedout.cpp b/src/core/stdmsg/src/msgtimedout.cpp index 450e04d2e8..5ecaf6861f 100644 --- a/src/core/stdmsg/src/msgtimedout.cpp +++ b/src/core/stdmsg/src/msgtimedout.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdmsg/src/richutil.cpp b/src/core/stdmsg/src/richutil.cpp index 53bf684119..b91097efa2 100644 --- a/src/core/stdmsg/src/richutil.cpp +++ b/src/core/stdmsg/src/richutil.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdmsg/src/richutil.h b/src/core/stdmsg/src/richutil.h index 1408c85ead..129b6fd0ba 100644 --- a/src/core/stdmsg/src/richutil.h +++ b/src/core/stdmsg/src/richutil.h @@ -1,6 +1,6 @@ /*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdmsg/src/srmm.cpp b/src/core/stdmsg/src/srmm.cpp index f589529137..36c8ed81c7 100644 --- a/src/core/stdmsg/src/srmm.cpp +++ b/src/core/stdmsg/src/srmm.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdmsg/src/statusicon.cpp b/src/core/stdmsg/src/statusicon.cpp index 294493e6e5..1ad1395032 100644 --- a/src/core/stdmsg/src/statusicon.cpp +++ b/src/core/stdmsg/src/statusicon.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdmsg/src/stdafx.cpp b/src/core/stdmsg/src/stdafx.cpp index 838b101bd3..df76ee5802 100644 --- a/src/core/stdmsg/src/stdafx.cpp +++ b/src/core/stdmsg/src/stdafx.cpp @@ -1,6 +1,6 @@ /*
-Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG team (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/core/stduihist/commonheaders.h b/src/core/stduihist/commonheaders.h index dd332f5e00..f5744ec23b 100644 --- a/src/core/stduihist/commonheaders.h +++ b/src/core/stduihist/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stduihist/history.cpp b/src/core/stduihist/history.cpp index dc1e9923d7..0152d177bf 100644 --- a/src/core/stduihist/history.cpp +++ b/src/core/stduihist/history.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -152,7 +153,7 @@ static void FillHistoryThread(void* param) DBEVENTINFO dbei = { sizeof(dbei) };
int oldBlobSize = 0;
HANDLE hDbEvent = db_event_last(hInfo->hContact);
-
+
while (hDbEvent != NULL) {
if ( !IsWindow(hInfo->hwnd))
break;
diff --git a/src/core/stdurl/commonheaders.h b/src/core/stdurl/commonheaders.h index 59087c13ad..93e42c1e33 100644 --- a/src/core/stdurl/commonheaders.h +++ b/src/core/stdurl/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stdurl/url.cpp b/src/core/stdurl/url.cpp index 65df220380..eae566e402 100644 --- a/src/core/stdurl/url.cpp +++ b/src/core/stdurl/url.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/src/core/stdurl/url.h b/src/core/stdurl/url.h index dcdbf8e487..482ddf4a01 100644 --- a/src/core/stdurl/url.h +++ b/src/core/stdurl/url.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/src/core/stdurl/urldialogs.cpp b/src/core/stdurl/urldialogs.cpp index 06bd2b20ec..907720845c 100644 --- a/src/core/stdurl/urldialogs.cpp +++ b/src/core/stdurl/urldialogs.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -40,7 +41,7 @@ static void sttUpdateTitle(HWND hwndDlg, HANDLE hContact) int hasName = 0;
char buf[128];
ZeroMemory(&ci, sizeof(ci));
-
+
ci.cbSize = sizeof(ci);
ci.hContact = hContact;
ci.szProto = szProto;
@@ -61,7 +62,7 @@ static void sttUpdateTitle(HWND hwndDlg, HANDLE hContact) contactName = pcli->pfnGetContactDisplayName(hContact, 0);
if (hasName)
SetDlgItemTextA(hwndDlg, IDC_NAME, buf);
- else
+ else
SetDlgItemText(hwndDlg, IDC_NAME, contactName);
szStatus = pcli->pfnGetStatusModeDescription(szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);
@@ -112,7 +113,7 @@ INT_PTR CALLBACK DlgProcUrlRecv(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP SetWindowText(hwndDlg, msg);
SetDlgItemText(hwndDlg, IDC_FROM, contactName);
SendDlgItemMessage(hwndDlg, IDOK, BUTTONSETARROW, 1, 0);
-
+
TCHAR str[128];
tmi.printTimeStamp(NULL, dbei.timestamp, _T("t d"), str, SIZEOF(str), 0);
SetDlgItemText(hwndDlg, IDC_DATE, str);
@@ -132,22 +133,22 @@ INT_PTR CALLBACK DlgProcUrlRecv(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
case WM_DRAWITEM:
- {
+ {
LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam;
if (dis->hwndItem == GetDlgItem(hwndDlg, IDC_PROTOCOL)) {
char *szProto;
-
+
szProto = GetContactProto(dat->hContact);
if (szProto) {
HICON hIcon;
-
+
hIcon = (HICON)CallProtoService(szProto, PS_LOADICON, PLI_PROTOCOL|PLIF_SMALL, 0);
if (hIcon) {
DrawIconEx(dis->hDC, dis->rcItem.left, dis->rcItem.top, hIcon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, NULL, DI_NORMAL);
DestroyIcon(hIcon);
} } } }
return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
-
+
case DM_UPDATETITLE:
sttUpdateTitle(hwndDlg, dat->hContact);
break;
@@ -211,7 +212,7 @@ INT_PTR CALLBACK DlgProcUrlRecv(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP case IDC_ADD:
{
ADDCONTACTSTRUCT acs = {0};
-
+
acs.handle = dat->hContact;
acs.handleType = HANDLE_CONTACT;
acs.szProto = 0;
diff --git a/src/core/stduserinfo/commonheaders.h b/src/core/stduserinfo/commonheaders.h index 2cf6182ff6..f531d749f3 100644 --- a/src/core/stduserinfo/commonheaders.h +++ b/src/core/stduserinfo/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stduserinfo/contactinfo.cpp b/src/core/stduserinfo/contactinfo.cpp index f651013852..f674685200 100644 --- a/src/core/stduserinfo/contactinfo.cpp +++ b/src/core/stduserinfo/contactinfo.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stduserinfo/stdinfo.cpp b/src/core/stduserinfo/stdinfo.cpp index 5ef8310ce6..b807e8f37e 100644 --- a/src/core/stduserinfo/stdinfo.cpp +++ b/src/core/stduserinfo/stdinfo.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -331,7 +332,7 @@ static INT_PTR CALLBACK WorkDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA SetValue(hwndDlg, IDC_ZIP, hContact, szProto, "CompanyZIP", SVS_ZEROISUNSPEC);
SetValue(hwndDlg, IDC_COUNTRY, hContact, szProto, "CompanyCountry", SVS_COUNTRY);
SetValue(hwndDlg, IDC_WEBPAGE, hContact, szProto, "CompanyHomepage", SVS_ZEROISUNSPEC);
- }
+ }
}
break;
}
diff --git a/src/core/stduserinfo/userinfo.cpp b/src/core/stduserinfo/userinfo.cpp index f3fe5ef5c8..bd958a9202 100644 --- a/src/core/stduserinfo/userinfo.cpp +++ b/src/core/stduserinfo/userinfo.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stduseronline/commonheaders.h b/src/core/stduseronline/commonheaders.h index 3d1df67fc3..1b1e6585ee 100644 --- a/src/core/stduseronline/commonheaders.h +++ b/src/core/stduseronline/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/core/stduseronline/useronline.cpp b/src/core/stduseronline/useronline.cpp index c25af18b82..12fcb3c6ed 100644 --- a/src/core/stduseronline/useronline.cpp +++ b/src/core/stduseronline/useronline.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/cmdline.cpp b/src/mir_core/cmdline.cpp index acda692e0f..91f9c836bf 100644 --- a/src/mir_core/cmdline.cpp +++ b/src/mir_core/cmdline.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-13 Miranda NG project,
+Copyright (C) 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/commonheaders.h b/src/mir_core/commonheaders.h index bf8e5444ff..6e0b88f454 100644 --- a/src/mir_core/commonheaders.h +++ b/src/mir_core/commonheaders.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/db.cpp b/src/mir_core/db.cpp index c4305ae33c..eec60f9750 100644 --- a/src/mir_core/db.cpp +++ b/src/mir_core/db.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/http.cpp b/src/mir_core/http.cpp index ff81a8fcbb..b47cdd4e9c 100644 --- a/src/mir_core/http.cpp +++ b/src/mir_core/http.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG team (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/icons.cpp b/src/mir_core/icons.cpp index e429308466..77c924be25 100644 --- a/src/mir_core/icons.cpp +++ b/src/mir_core/icons.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-13 Miranda NG project,
+Copyright (C) 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/json/JSONChildren.cpp b/src/mir_core/json/JSONChildren.cpp index a5e85b69d5..1eb9e29d46 100644 --- a/src/mir_core/json/JSONChildren.cpp +++ b/src/mir_core/json/JSONChildren.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/json/JSONDebug.cpp b/src/mir_core/json/JSONDebug.cpp index 084b6dbb28..e5ba81a188 100644 --- a/src/mir_core/json/JSONDebug.cpp +++ b/src/mir_core/json/JSONDebug.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/json/JSONIterators.cpp b/src/mir_core/json/JSONIterators.cpp index 5da3c76a72..1ff164e1be 100644 --- a/src/mir_core/json/JSONIterators.cpp +++ b/src/mir_core/json/JSONIterators.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/json/JSONMemory.cpp b/src/mir_core/json/JSONMemory.cpp index 91744dc3ab..dfe757b5c1 100644 --- a/src/mir_core/json/JSONMemory.cpp +++ b/src/mir_core/json/JSONMemory.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/json/JSONNode.cpp b/src/mir_core/json/JSONNode.cpp index 8a410f2fc8..b1a492b5a6 100644 --- a/src/mir_core/json/JSONNode.cpp +++ b/src/mir_core/json/JSONNode.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/json/JSONNode_Mutex.cpp b/src/mir_core/json/JSONNode_Mutex.cpp index 6aa480d193..497e867f62 100644 --- a/src/mir_core/json/JSONNode_Mutex.cpp +++ b/src/mir_core/json/JSONNode_Mutex.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/json/JSONWorker.cpp b/src/mir_core/json/JSONWorker.cpp index a52b85b3f8..cf8254a357 100644 --- a/src/mir_core/json/JSONWorker.cpp +++ b/src/mir_core/json/JSONWorker.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/json/JSONWriter.cpp b/src/mir_core/json/JSONWriter.cpp index 579f08093d..edf407d25d 100644 --- a/src/mir_core/json/JSONWriter.cpp +++ b/src/mir_core/json/JSONWriter.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/json/internalJSONNode.cpp b/src/mir_core/json/internalJSONNode.cpp index 4e3bccbf58..4b33ad9545 100644 --- a/src/mir_core/json/internalJSONNode.cpp +++ b/src/mir_core/json/internalJSONNode.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/json/libJSON.cpp b/src/mir_core/json/libJSON.cpp index 2bf69f0e5d..d55505c4eb 100644 --- a/src/mir_core/json/libJSON.cpp +++ b/src/mir_core/json/libJSON.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/langpack.cpp b/src/mir_core/langpack.cpp index 9c14f3cba6..a23e6311a6 100644 --- a/src/mir_core/langpack.cpp +++ b/src/mir_core/langpack.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -74,7 +75,7 @@ static int ConvertBackslashes(char *str, UINT fileCp) char *pstr;
for (pstr = str; *pstr; pstr = CharNextExA(fileCp, pstr, 0)) {
if (*pstr == '\\') {
- shift++;
+ shift++;
switch(pstr[1]) {
case 'n': *pstr = '\n'; break;
case 't': *pstr = '\t'; break;
@@ -84,7 +85,7 @@ static int ConvertBackslashes(char *str, UINT fileCp) }
memmove(pstr+1, pstr+2, strlen(pstr+2) + 1);
}
- }
+ }
return shift;
}
@@ -355,7 +356,7 @@ MIR_CORE_DLL(int) LoadLangPack(const TCHAR *szLangPack) else if ( !lstrcmpA(line, "Last-Modified-Using")) {mir_snprintf(langPack.lastModifiedUsing, sizeof(langPack.lastModifiedUsing), "%s", pszColon); lrtrim(langPack.lastModifiedUsing);}
else if ( !lstrcmpA(line, "Authors")) {mir_snprintf(langPack.authors, sizeof(langPack.authors), "%s", pszColon); lrtrim(langPack.authors);}
else if ( !lstrcmpA(line, "Author-email")) {mir_snprintf(langPack.authorEmail, sizeof(langPack.authorEmail), "%s", pszColon); lrtrim(langPack.authorEmail);}
- else if ( !lstrcmpA(line, "Locale")) {
+ else if ( !lstrcmpA(line, "Locale")) {
char szBuf[20], *stopped;
lrtrim(pszColon + 1);
diff --git a/src/mir_core/lists.cpp b/src/mir_core/lists.cpp index 80b38faef7..9998324776 100644 --- a/src/mir_core/lists.cpp +++ b/src/mir_core/lists.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/logger.cpp b/src/mir_core/logger.cpp index 7cdc3c600e..bb42e0444c 100644 --- a/src/mir_core/logger.cpp +++ b/src/mir_core/logger.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -43,7 +44,7 @@ struct Logger {
if (m_out)
fclose(m_out);
-
+
DeleteCriticalSection(&m_cs);
}
diff --git a/src/mir_core/memory.cpp b/src/mir_core/memory.cpp index ef3006aad3..2405e6580c 100644 --- a/src/mir_core/memory.cpp +++ b/src/mir_core/memory.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -170,7 +171,7 @@ MIR_CORE_DLL(char*) mir_strndup(const char *str, size_t len) {
if (str == NULL || len == 0)
return NULL;
-
+
char *p = (char*)mir_alloc(len+1);
if (p) {
memcpy(p, str, len);
@@ -183,7 +184,7 @@ MIR_CORE_DLL(WCHAR*) mir_wstrndup(const WCHAR *str, size_t len) {
if (str == NULL || len == 0)
return NULL;
-
+
WCHAR *p = (WCHAR*)mir_alloc(sizeof(WCHAR)*(len+1));
if (p) {
memcpy(p, str, sizeof(WCHAR)*len);
diff --git a/src/mir_core/miranda.cpp b/src/mir_core/miranda.cpp index c82971d918..4804665e45 100644 --- a/src/mir_core/miranda.cpp +++ b/src/mir_core/miranda.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/miranda.h b/src/mir_core/miranda.h index 84541a819d..cc4be6ecae 100644 --- a/src/mir_core/miranda.h +++ b/src/mir_core/miranda.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/modules.cpp b/src/mir_core/modules.cpp index 2ea78d5e34..0352802dfe 100644 --- a/src/mir_core/modules.cpp +++ b/src/mir_core/modules.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -134,7 +135,7 @@ MIR_CORE_DLL(int) DestroyHookableEvent(HANDLE hEvent) int idx;
if ((idx = hooks.getIndex((THook*)hEvent)) == -1)
return 1;
-
+
THook* p = hooks[idx];
p->secretSignature = 0;
if (p->subscriberCount) {
@@ -416,8 +417,8 @@ MIR_CORE_DLL(void) KillObjectEventHooks(void* pObject) UnhookEvent((HANDLE)((hooks[i]->id << 16) + j + 1));
if (hooks[i]->subscriberCount == 0)
break;
- }
- }
+ }
+ }
}
}
@@ -544,7 +545,7 @@ MIR_CORE_DLL(INT_PTR) CallServiceSync(const char *name, WPARAM wParam, LPARAM lP {
if (name == NULL)
return CALLSERVICE_NOTFOUND;
-
+
// the service is looked up within the main thread, since the time it takes
// for the APC queue to clear the service being called maybe removed.
// even thou it may exists before the call, the critsec can't be locked between calls.
diff --git a/src/mir_core/mstring.cpp b/src/mir_core/mstring.cpp index e0776da599..8d071b61c1 100644 --- a/src/mir_core/mstring.cpp +++ b/src/mir_core/mstring.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -24,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "commonheaders.h"
/////////////////////////////////////////////////////////////////////////////////////////
-// CMBaseString
+// CMBaseString
class CNilMStringData : public CMStringData
{
@@ -47,7 +48,7 @@ CNilMStringData::CNilMStringData() static CNilMStringData m_nil;
/////////////////////////////////////////////////////////////////////////////////////////
-// CMBaseString
+// CMBaseString
MIR_CORE_DLL(CMStringData*) mirstr_allocate(int nChars, int nCharSize)
{
diff --git a/src/mir_core/path.cpp b/src/mir_core/path.cpp index 9e96c4348b..8e0575f861 100644 --- a/src/mir_core/path.cpp +++ b/src/mir_core/path.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -67,7 +68,7 @@ MIR_CORE_DLL(int) PathToAbsolute(const char *pSrc, char *pOut, char* base) char buf[MAX_PATH];
if (pSrc[0] < ' ')
return mir_snprintf(pOut, MAX_PATH, "%s", pSrc);
-
+
if (pathIsAbsolute(pSrc))
return GetFullPathNameA(pSrc, MAX_PATH, pOut, NULL);
@@ -153,10 +154,10 @@ MIR_CORE_DLL(int) PathToAbsoluteW(const TCHAR *pSrc, TCHAR *pOut, TCHAR* base) TCHAR buf[MAX_PATH];
if (pSrc[0] < ' ')
return mir_sntprintf(pOut, MAX_PATH, _T("%s"), pSrc);
-
+
if (pathIsAbsoluteW(pSrc))
return GetFullPathName(pSrc, MAX_PATH, pOut, NULL);
-
+
if (base == NULL)
base = szMirandaPathW;
diff --git a/src/mir_core/protos.cpp b/src/mir_core/protos.cpp index d4a02757bb..eeda5305e6 100644 --- a/src/mir_core/protos.cpp +++ b/src/mir_core/protos.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-13 Miranda NG project,
+Copyright (C) 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/stdafx.cpp b/src/mir_core/stdafx.cpp index 270c270550..9c953189b2 100644 --- a/src/mir_core/stdafx.cpp +++ b/src/mir_core/stdafx.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG team (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/subclass.cpp b/src/mir_core/subclass.cpp index c6fddcb5e8..74d500aee2 100644 --- a/src/mir_core/subclass.cpp +++ b/src/mir_core/subclass.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG team (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/mir_core/threads.cpp b/src/mir_core/threads.cpp index af61aa82f9..568ef30563 100644 --- a/src/mir_core/threads.cpp +++ b/src/mir_core/threads.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/utf.cpp b/src/mir_core/utf.cpp index 2a07f24626..1e30cdecf5 100644 --- a/src/mir_core/utf.cpp +++ b/src/mir_core/utf.cpp @@ -1,12 +1,13 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
- Copyright 2000 Alexandre Julliard of Wine project
+ Copyright 2000 Alexandre Julliard of Wine project
(UTF-8 conversion routines)
This program is free software; you can redistribute it and/or
@@ -14,7 +15,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -249,7 +250,7 @@ int Utf8toUcs2(const char *src, int srclen, wchar_t *dst, int dstlen) MIR_CORE_DLL(char*) Utf8DecodeCP(char *str, int codepage, wchar_t **ucs2)
{
- int len;
+ int len;
bool needs_free = false;
wchar_t* tempBuf = NULL;
if (ucs2)
@@ -291,7 +292,7 @@ MIR_CORE_DLL(char*) Utf8DecodeCP(char *str, int codepage, wchar_t **ucs2) return NULL;
}
- Utf8toUcs2(str, len, tempBuf, destlen);
+ Utf8toUcs2(str, len, tempBuf, destlen);
tempBuf[destlen] = 0;
WideCharToMultiByte(codepage, 0, tempBuf, -1, str, len + 1, "?", NULL);
@@ -337,7 +338,7 @@ MIR_CORE_DLL(wchar_t*) Utf8DecodeW(const char *str) MIR_CORE_DLL(char*) Utf8EncodeCP(const char* src, int codepage)
{
- int len;
+ int len;
bool needs_free = false;
char* result = NULL;
wchar_t* tempBuf;
diff --git a/src/mir_core/utils.cpp b/src/mir_core/utils.cpp index 076747cd1e..996654ea84 100644 --- a/src/mir_core/utils.cpp +++ b/src/mir_core/utils.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/winver.cpp b/src/mir_core/winver.cpp index 96f2ddb26b..7c568a59a4 100644 --- a/src/mir_core/winver.cpp +++ b/src/mir_core/winver.cpp @@ -1,5 +1,5 @@ /*
-Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org)
+Copyright (C) 2012-14 Miranda NG team (http://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/src/modules/addcontact/addcontact.cpp b/src/modules/addcontact/addcontact.cpp index e81b7c2ce2..1bf3cce1b4 100644 --- a/src/modules/addcontact/addcontact.cpp +++ b/src/modules/addcontact/addcontact.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -99,7 +100,7 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lp // By default check both checkboxes
CheckDlgButton(hdlg, IDC_ADDED, BST_CHECKED);
CheckDlgButton(hdlg, IDC_AUTH, BST_CHECKED);
-
+
// Set last choice
if (db_get_b(NULL, "Miranda", "AuthOpenWindow", 1))
CheckDlgButton(hdlg, IDC_OPEN_WINDOW, BST_CHECKED);
diff --git a/src/modules/button/button.cpp b/src/modules/button/button.cpp index 2f6c2f4a01..62b5c131cc 100644 --- a/src/modules/button/button.cpp +++ b/src/modules/button/button.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -255,7 +256,7 @@ static LRESULT CALLBACK MButtonWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR bct->fnPainter = PaintWorker;
bct->hFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
LoadTheme(bct);
-
+
// Annotating the Role of this object to be PushButton
if (SUCCEEDED(CoCreateInstance(CLSID_AccPropServices, NULL, CLSCTX_SERVER, IID_IAccPropServices, (void**)&bct->pAccPropServices)))
SetHwndPropInt(bct, OBJID_CLIENT, CHILDID_SELF, PROPID_ACC_ROLE, ROLE_SYSTEM_PUSHBUTTON);
diff --git a/src/modules/clist/Docking.cpp b/src/modules/clist/Docking.cpp index 2186e5237c..62fa64070a 100644 --- a/src/modules/clist/Docking.cpp +++ b/src/modules/clist/Docking.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/clc.cpp b/src/modules/clist/clc.cpp index 24bd9c992d..72dd0fd438 100644 --- a/src/modules/clist/clc.cpp +++ b/src/modules/clist/clc.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/clc.h b/src/modules/clist/clc.h index 43bdf9febd..4732800a42 100644 --- a/src/modules/clist/clc.h +++ b/src/modules/clist/clc.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/src/modules/clist/clcfiledrop.cpp b/src/modules/clist/clcfiledrop.cpp index cbcf7ca3a5..7442a15bed 100644 --- a/src/modules/clist/clcfiledrop.cpp +++ b/src/modules/clist/clcfiledrop.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/clcidents.cpp b/src/modules/clist/clcidents.cpp index a65e3a6d6f..d943b8065d 100644 --- a/src/modules/clist/clcidents.cpp +++ b/src/modules/clist/clcidents.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/clcitems.cpp b/src/modules/clist/clcitems.cpp index 02818eb71b..b56341a74c 100644 --- a/src/modules/clist/clcitems.cpp +++ b/src/modules/clist/clcitems.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/clcmsgs.cpp b/src/modules/clist/clcmsgs.cpp index ccde719557..c60526cfc0 100644 --- a/src/modules/clist/clcmsgs.cpp +++ b/src/modules/clist/clcmsgs.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/clcutils.cpp b/src/modules/clist/clcutils.cpp index e6ad8acf57..f9031c55a6 100644 --- a/src/modules/clist/clcutils.cpp +++ b/src/modules/clist/clcutils.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/clistcore.cpp b/src/modules/clist/clistcore.cpp index af427bef36..2daaad4e52 100644 --- a/src/modules/clist/clistcore.cpp +++ b/src/modules/clist/clistcore.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/src/modules/clist/clistevents.cpp b/src/modules/clist/clistevents.cpp index 2176935027..bc541a87ab 100644 --- a/src/modules/clist/clistevents.cpp +++ b/src/modules/clist/clistevents.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp index ef7fcde149..a2487c77d3 100644 --- a/src/modules/clist/clistmenus.cpp +++ b/src/modules/clist/clistmenus.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/clistmod.cpp b/src/modules/clist/clistmod.cpp index ab43e226aa..a20ee87a0a 100644 --- a/src/modules/clist/clistmod.cpp +++ b/src/modules/clist/clistmod.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/clistsettings.cpp b/src/modules/clist/clistsettings.cpp index fa022967e8..16aff8469d 100644 --- a/src/modules/clist/clistsettings.cpp +++ b/src/modules/clist/clistsettings.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/clisttray.cpp b/src/modules/clist/clisttray.cpp index 6a4a6522c3..6473461602 100644 --- a/src/modules/clist/clisttray.cpp +++ b/src/modules/clist/clisttray.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -538,7 +539,7 @@ int fnTrayCalcChanged(const char *szChangedProto, int averageMode, int netProtoC return -1;
}
-
+
void fnTrayIconSetToBase(char *szPreferredProto)
{
int i;
diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp index 0e0ef05e14..569c8c9556 100644 --- a/src/modules/clist/clui.cpp +++ b/src/modules/clist/clui.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/cluiservices.cpp b/src/modules/clist/cluiservices.cpp index 1f50dfba8d..01c82f9b86 100644 --- a/src/modules/clist/cluiservices.cpp +++ b/src/modules/clist/cluiservices.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/contact.cpp b/src/modules/clist/contact.cpp index a66497e895..30d9ac3505 100644 --- a/src/modules/clist/contact.cpp +++ b/src/modules/clist/contact.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/contacts.cpp b/src/modules/clist/contacts.cpp index 215265a044..845e8f2736 100644 --- a/src/modules/clist/contacts.cpp +++ b/src/modules/clist/contacts.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/genmenu.cpp b/src/modules/clist/genmenu.cpp index c5bc09d30e..aa9430712c 100644 --- a/src/modules/clist/genmenu.cpp +++ b/src/modules/clist/genmenu.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/genmenu.h b/src/modules/clist/genmenu.h index e33fc6159a..01fe335f64 100644 --- a/src/modules/clist/genmenu.h +++ b/src/modules/clist/genmenu.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/genmenuopt.cpp b/src/modules/clist/genmenuopt.cpp index 1e2649b779..6511c2d2b5 100644 --- a/src/modules/clist/genmenuopt.cpp +++ b/src/modules/clist/genmenuopt.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -428,7 +429,7 @@ static int handleCustomDraw(HWND hWndTreeView, LPNMTVCUSTOMDRAW pNMTVCD) {
HTREEITEM hItem = (HTREEITEM) pNMTVCD->nmcd.dwItemSpec;
TCHAR buf[255];
-
+
TVITEM tvi = {0};
tvi.mask = TVIF_HANDLE |TVIF_PARAM|TVIS_SELECTED|TVIF_TEXT|TVIF_IMAGE;
tvi.stateMask = TVIS_SELECTED;
diff --git a/src/modules/clist/groups.cpp b/src/modules/clist/groups.cpp index 560261259f..641e9c55af 100644 --- a/src/modules/clist/groups.cpp +++ b/src/modules/clist/groups.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/keyboard.cpp b/src/modules/clist/keyboard.cpp index 5ea408a8a6..13092615f6 100644 --- a/src/modules/clist/keyboard.cpp +++ b/src/modules/clist/keyboard.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/movetogroup.cpp b/src/modules/clist/movetogroup.cpp index a3392a96d7..b858013c78 100644 --- a/src/modules/clist/movetogroup.cpp +++ b/src/modules/clist/movetogroup.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/clist/protocolorder.cpp b/src/modules/clist/protocolorder.cpp index 953833970c..a2bf6dd2ea 100644 --- a/src/modules/clist/protocolorder.cpp +++ b/src/modules/clist/protocolorder.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/crypt/encrypt.cpp b/src/modules/crypt/encrypt.cpp index 2868eb41c4..ddea529674 100644 --- a/src/modules/crypt/encrypt.cpp +++ b/src/modules/crypt/encrypt.cpp @@ -1,8 +1,8 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -65,7 +65,7 @@ static INT_PTR srvGetProvider(WPARAM wParam, LPARAM lParam) CRYPTO_PROVIDER tmp;
tmp.pszName = (LPSTR)lParam;
return (INT_PTR)arProviders.find(&tmp);
-}
+}
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/modules/database/database.cpp b/src/modules/database/database.cpp index cbdcce2cea..7380631318 100644 --- a/src/modules/database/database.cpp +++ b/src/modules/database/database.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -63,7 +64,7 @@ bool IsInsideRootDir(TCHAR* profiledir, bool exact) VARST pfd( _T("%miranda_path%"));
if (exact)
return _tcsicmp(profiledir, pfd) == 0;
-
+
return _tcsnicmp(profiledir, pfd, _tcslen(pfd)) == 0;
}
@@ -368,7 +369,7 @@ int tryOpenDatabase(const TCHAR *tszProfile) return 0;
}
}
-
+
return (bWasOpened) ? -1 : EGROKPRF_CANTREAD;
}
diff --git a/src/modules/database/database.h b/src/modules/database/database.h index dbecd9dc08..33121c8fcf 100644 --- a/src/modules/database/database.h +++ b/src/modules/database/database.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2012-13 Miranda NG project,
+Copyright 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/database/dbini.cpp b/src/modules/database/dbini.cpp index 672350084e..022f4c1188 100644 --- a/src/modules/database/dbini.cpp +++ b/src/modules/database/dbini.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/src/modules/database/dbintf.cpp b/src/modules/database/dbintf.cpp index aaf77aa895..72afdb4866 100644 --- a/src/modules/database/dbintf.cpp +++ b/src/modules/database/dbintf.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-13 Miranda NG project,
+Copyright (C) 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/database/dbutils.cpp b/src/modules/database/dbutils.cpp index bb74b6b595..302d7fdd65 100644 --- a/src/modules/database/dbutils.cpp +++ b/src/modules/database/dbutils.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -44,7 +45,7 @@ static INT_PTR DbEventTypeRegister(WPARAM, LPARAM lParam) DBEVENTTYPEDESCR* p = (DBEVENTTYPEDESCR*)mir_calloc(sizeof(DBEVENTTYPEDESCR));
p->cbSize = DBEVENTTYPEDESCR_SIZE;
p->module = mir_strdup(et->module);
- p->eventType = et->eventType;
+ p->eventType = et->eventType;
p->descr = mir_strdup(et->descr);
if (et->cbSize == DBEVENTTYPEDESCR_SIZE) {
if (et->textService)
@@ -117,7 +118,7 @@ static INT_PTR DbEventGetText(WPARAM wParam, LPARAM lParam) ptrT tszFirst(getEventString(dbei, buf));
ptrT tszLast(getEventString(dbei, buf));
ptrT tszEmail(getEventString(dbei, buf));
-
+
CMString nick, text;
if (tszFirst || tszLast) {
nick.AppendFormat(_T("%s %s"), tszFirst, tszLast);
@@ -175,7 +176,7 @@ static INT_PTR DbEventGetText(WPARAM wParam, LPARAM lParam) return 0;
}
- // by default treat an event's blob as a string
+ // by default treat an event's blob as a string
if (egt->datatype == DBVT_WCHAR) {
char *str = (char*)alloca(dbei->cbBlob + 1);
memcpy(str, dbei->pBlob, dbei->cbBlob);
@@ -298,7 +299,7 @@ static INT_PTR GetProfileName(WPARAM wParam, LPARAM lParam) char *tmp = makeFileName(g_profileName);
strncpy(dst, tmp, wParam);
mir_free(tmp);
-
+
dst[wParam-1] = 0;
return 0;
}
diff --git a/src/modules/database/mdatabasecache.cpp b/src/modules/database/mdatabasecache.cpp index 30ad6beb3b..6a8a58c1f4 100644 --- a/src/modules/database/mdatabasecache.cpp +++ b/src/modules/database/mdatabasecache.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-13 Miranda NG project,
+Copyright (C) 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/database/profilemanager.cpp b/src/modules/database/profilemanager.cpp index 7245bd3dba..c69a89de89 100644 --- a/src/modules/database/profilemanager.cpp +++ b/src/modules/database/profilemanager.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -73,7 +74,7 @@ struct ProfileEnumData TCHAR* szProfile;
};
-extern TCHAR mirandabootini[MAX_PATH];
+extern TCHAR mirandabootini[MAX_PATH];
void SetServiceModePlugin(pluginEntry *p);
diff --git a/src/modules/database/profilemanager.h b/src/modules/database/profilemanager.h index d91b71570a..699fb869b3 100644 --- a/src/modules/database/profilemanager.h +++ b/src/modules/database/profilemanager.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/src/modules/extraicons/BaseExtraIcon.cpp b/src/modules/extraicons/BaseExtraIcon.cpp index d94ded904e..d8016f56be 100644 --- a/src/modules/extraicons/BaseExtraIcon.cpp +++ b/src/modules/extraicons/BaseExtraIcon.cpp @@ -1,7 +1,7 @@ /*
Copyright (C) 2009 Ricardo Pescuma Domenecci
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-14 Miranda NG project
This is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/src/modules/extraicons/CallbackExtraIcon.cpp b/src/modules/extraicons/CallbackExtraIcon.cpp index e82a037f31..3e7229d5ca 100644 --- a/src/modules/extraicons/CallbackExtraIcon.cpp +++ b/src/modules/extraicons/CallbackExtraIcon.cpp @@ -1,7 +1,7 @@ /*
Copyright (C) 2009 Ricardo Pescuma Domenecci
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-14 Miranda NG project
This is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/src/modules/extraicons/DefaultExtraIcons.cpp b/src/modules/extraicons/DefaultExtraIcons.cpp index 3287a72d1d..79bb0677ff 100644 --- a/src/modules/extraicons/DefaultExtraIcons.cpp +++ b/src/modules/extraicons/DefaultExtraIcons.cpp @@ -1,7 +1,7 @@ /*
Copyright (C) 2009 Ricardo Pescuma Domenecci
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-14 Miranda NG project
This is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/src/modules/extraicons/ExtraIcon.cpp b/src/modules/extraicons/ExtraIcon.cpp index 5298ea3a64..7354a8ad6b 100644 --- a/src/modules/extraicons/ExtraIcon.cpp +++ b/src/modules/extraicons/ExtraIcon.cpp @@ -1,7 +1,7 @@ /*
Copyright (C) 2009 Ricardo Pescuma Domenecci
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-14 Miranda NG project
This is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/src/modules/extraicons/ExtraIcon.h b/src/modules/extraicons/ExtraIcon.h index 8b2a7a56ae..dd76607cb9 100644 --- a/src/modules/extraicons/ExtraIcon.h +++ b/src/modules/extraicons/ExtraIcon.h @@ -1,7 +1,7 @@ /*
Copyright (C) 2009 Ricardo Pescuma Domenecci
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-14 Miranda NG project
This is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/src/modules/extraicons/ExtraIconGroup.cpp b/src/modules/extraicons/ExtraIconGroup.cpp index dff2601695..0be86e5008 100644 --- a/src/modules/extraicons/ExtraIconGroup.cpp +++ b/src/modules/extraicons/ExtraIconGroup.cpp @@ -1,7 +1,7 @@ /*
Copyright (C) 2009 Ricardo Pescuma Domenecci
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-14 Miranda NG project
This is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/src/modules/extraicons/IcolibExtraIcon.cpp b/src/modules/extraicons/IcolibExtraIcon.cpp index 0b67630d17..832d15f350 100644 --- a/src/modules/extraicons/IcolibExtraIcon.cpp +++ b/src/modules/extraicons/IcolibExtraIcon.cpp @@ -1,7 +1,7 @@ /*
Copyright (C) 2009 Ricardo Pescuma Domenecci
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-14 Miranda NG project
This is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/src/modules/extraicons/extraicons.cpp b/src/modules/extraicons/extraicons.cpp index 4b7876b79c..6de316c5a6 100644 --- a/src/modules/extraicons/extraicons.cpp +++ b/src/modules/extraicons/extraicons.cpp @@ -1,7 +1,7 @@ /*
Copyright (C) 2009 Ricardo Pescuma Domenecci
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-14 Miranda NG project
This is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/src/modules/extraicons/extraicons.h b/src/modules/extraicons/extraicons.h index c24483def5..e2c15572bf 100644 --- a/src/modules/extraicons/extraicons.h +++ b/src/modules/extraicons/extraicons.h @@ -1,7 +1,7 @@ /*
Copyright (C) 2009 Ricardo Pescuma Domenecci
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-14 Miranda NG project
This is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/src/modules/extraicons/options_ei.cpp b/src/modules/extraicons/options_ei.cpp index a7ce5cb64e..cf82b557fb 100644 --- a/src/modules/extraicons/options_ei.cpp +++ b/src/modules/extraicons/options_ei.cpp @@ -1,7 +1,7 @@ /*
Copyright (C) 2009 Ricardo Pescuma Domenecci
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-14 Miranda NG project
This is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/src/modules/extraicons/usedIcons.cpp b/src/modules/extraicons/usedIcons.cpp index 374f4bfb1c..882b8259fe 100644 --- a/src/modules/extraicons/usedIcons.cpp +++ b/src/modules/extraicons/usedIcons.cpp @@ -1,7 +1,7 @@ /*
Copyright (C) 2009 Ricardo Pescuma Domenecci
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-14 Miranda NG project
This is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/src/modules/extraicons/usedIcons.h b/src/modules/extraicons/usedIcons.h index aaf97de1b5..bb9334e155 100644 --- a/src/modules/extraicons/usedIcons.h +++ b/src/modules/extraicons/usedIcons.h @@ -1,7 +1,7 @@ /*
Copyright (C) 2009 Ricardo Pescuma Domenecci
-Copyright (C) 2012-13 Miranda NG Project
+Copyright (C) 2012-14 Miranda NG project
This is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/src/modules/findadd/findadd.cpp b/src/modules/findadd/findadd.cpp index 2a8919b125..56cb499dca 100644 --- a/src/modules/findadd/findadd.cpp +++ b/src/modules/findadd/findadd.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/findadd/findadd.h b/src/modules/findadd/findadd.h index e9c13610e4..5fd5f24724 100644 --- a/src/modules/findadd/findadd.h +++ b/src/modules/findadd/findadd.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/findadd/searchresults.cpp b/src/modules/findadd/searchresults.cpp index 95b4c2826e..9bf94d3713 100644 --- a/src/modules/findadd/searchresults.cpp +++ b/src/modules/findadd/searchresults.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/fonts/FontOptions.cpp b/src/modules/fonts/FontOptions.cpp index f9eff2e32d..3ab3696249 100644 --- a/src/modules/fonts/FontOptions.cpp +++ b/src/modules/fonts/FontOptions.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -851,10 +852,10 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, hbrBack = CreateBrushIndirect(&lb);
}
- SetRect(&rc,
- dis->rcItem.left+FSUI_COLORBOXLEFT,
- dis->rcItem.top+FSUI_FONTFRAMEVERT,
- dis->rcItem.left+FSUI_COLORBOXLEFT+FSUI_COLORBOXWIDTH,
+ SetRect(&rc,
+ dis->rcItem.left+FSUI_COLORBOXLEFT,
+ dis->rcItem.top+FSUI_FONTFRAMEVERT,
+ dis->rcItem.left+FSUI_COLORBOXLEFT+FSUI_COLORBOXWIDTH,
dis->rcItem.bottom-FSUI_FONTFRAMEVERT);
FillRect(dis->hDC, &rc, hbrBack);
@@ -882,10 +883,10 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, else {
RECT rc;
HBRUSH hbrTmp;
- SetRect(&rc,
- dis->rcItem.left+FSUI_COLORBOXLEFT,
- dis->rcItem.top+FSUI_FONTFRAMEVERT,
- dis->rcItem.left+FSUI_COLORBOXLEFT+FSUI_COLORBOXWIDTH,
+ SetRect(&rc,
+ dis->rcItem.left+FSUI_COLORBOXLEFT,
+ dis->rcItem.top+FSUI_FONTFRAMEVERT,
+ dis->rcItem.left+FSUI_COLORBOXLEFT+FSUI_COLORBOXWIDTH,
dis->rcItem.bottom-FSUI_FONTFRAMEVERT);
hbrTmp = CreateSolidBrush(clText);
@@ -1415,9 +1416,9 @@ INT_PTR CALLBACK DlgPluginOpt(HWND, UINT, WPARAM, LPARAM); int FontsModernOptInit(WPARAM wParam, LPARAM lParam)
{
- static int iBoldControls[] =
+ static int iBoldControls[] =
{
- IDC_TXT_TITLE1, IDC_TXT_TITLE2, IDC_TXT_TITLE3,
+ IDC_TXT_TITLE1, IDC_TXT_TITLE2, IDC_TXT_TITLE3,
MODERNOPT_CTRL_LAST
};
diff --git a/src/modules/fonts/FontService.cpp b/src/modules/fonts/FontService.cpp index f1c7aae4e6..f87e443a71 100644 --- a/src/modules/fonts/FontService.cpp +++ b/src/modules/fonts/FontService.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/src/modules/fonts/FontService.h b/src/modules/fonts/FontService.h index 98159fb9c7..14dde0f2cc 100644 --- a/src/modules/fonts/FontService.h +++ b/src/modules/fonts/FontService.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/src/modules/fonts/services.cpp b/src/modules/fonts/services.cpp index adccb3b8fe..e74b8a92f0 100644 --- a/src/modules/fonts/services.cpp +++ b/src/modules/fonts/services.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -236,7 +237,7 @@ void UpdateFontSettings(FontIDW* font_id, FontSettingsT* fontsettings) colour = GetColorFromDefault(font_id->deffontsettings.colour);
}
- fontsettings->style =
+ fontsettings->style =
(lf.lfWeight == FW_NORMAL ? 0 : DBFONTF_BOLD) | (lf.lfItalic ? DBFONTF_ITALIC : 0) | (lf.lfUnderline ? DBFONTF_UNDERLINE : 0) | (lf.lfStrikeOut ? DBFONTF_STRIKEOUT : 0);
fontsettings->size = (char)lf.lfHeight;
diff --git a/src/modules/icolib/IcoLib.h b/src/modules/icolib/IcoLib.h index c8a4f5a556..d743e0e4fd 100644 --- a/src/modules/icolib/IcoLib.h +++ b/src/modules/icolib/IcoLib.h @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -105,4 +106,3 @@ extern BOOL bNeedRebuild; extern int iconEventActive;
extern HICON hIconBlank;
extern HANDLE hIcons2ChangedEvent, hIconsChangedEvent;
-
diff --git a/src/modules/icolib/extracticon.cpp b/src/modules/icolib/extracticon.cpp index cd405a3f15..39113d2ef5 100644 --- a/src/modules/icolib/extracticon.cpp +++ b/src/modules/icolib/extracticon.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/icolib/skin2icons.cpp b/src/modules/icolib/skin2icons.cpp index 1b8ee3def0..585e26ab60 100644 --- a/src/modules/icolib/skin2icons.cpp +++ b/src/modules/icolib/skin2icons.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -30,8 +31,8 @@ HANDLE hIcons2ChangedEvent, hIconsChangedEvent; HICON hIconBlank = NULL;
-static HANDLE
- hIcoLib_AddNewIcon, hIcoLib_RemoveIcon, hIcoLib_GetIcon, hIcoLib_GetIcon2,
+static HANDLE
+ hIcoLib_AddNewIcon, hIcoLib_RemoveIcon, hIcoLib_GetIcon, hIcoLib_GetIcon2,
hIcoLib_GetIconHandle, hIcoLib_IsManaged, hIcoLib_AddRef, hIcoLib_ReleaseIcon;
int iconEventActive = 0;
@@ -189,7 +190,7 @@ static int InitializeBitmapInfoHeader(HBITMAP bitmap, BITMAPINFOHEADER* bi) return 0; // Success
}
-static int InternalGetDIBSizes(HBITMAP bitmap, int* InfoHeaderSize, int* ImageSize)
+static int InternalGetDIBSizes(HBITMAP bitmap, int* InfoHeaderSize, int* ImageSize)
{
BITMAPINFOHEADER bi;
@@ -239,7 +240,7 @@ static int GetIconData(HICON icon, BYTE** data, int* size) if ( !GetIconInfo(icon, &iconInfo)) return 1; // Failure
- if (InternalGetDIBSizes(iconInfo.hbmMask, &MonoInfoSize, &MonoBitsSize) ||
+ if (InternalGetDIBSizes(iconInfo.hbmMask, &MonoInfoSize, &MonoBitsSize) ||
InternalGetDIBSizes(iconInfo.hbmColor, &ColorInfoSize, &ColorBitsSize)) {
DeleteObject(iconInfo.hbmColor);
DeleteObject(iconInfo.hbmMask);
@@ -250,7 +251,7 @@ static int GetIconData(HICON icon, BYTE** data, int* size) void* ColorInfo = mir_alloc(ColorInfoSize);
void* ColorBits = mir_alloc(ColorBitsSize);
- if (InternalGetDIB(iconInfo.hbmMask, 0, MonoInfo, MonoBits) ||
+ if (InternalGetDIB(iconInfo.hbmMask, 0, MonoInfo, MonoBits) ||
InternalGetDIB(iconInfo.hbmColor, 0, ColorInfo, ColorBits)) {
SAFE_FREE(&MonoInfo);
SAFE_FREE(&MonoBits);
diff --git a/src/modules/icolib/skin2opts.cpp b/src/modules/icolib/skin2opts.cpp index 81be4a0b8d..a761d7854c 100644 --- a/src/modules/icolib/skin2opts.cpp +++ b/src/modules/icolib/skin2opts.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/ignore/ignore.cpp b/src/modules/ignore/ignore.cpp index b7e2ca1728..b797b1f9c5 100644 --- a/src/modules/ignore/ignore.cpp +++ b/src/modules/ignore/ignore.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/langpack/lpservices.cpp b/src/modules/langpack/lpservices.cpp index f99a9211f7..1e4f565058 100644 --- a/src/modules/langpack/lpservices.cpp +++ b/src/modules/langpack/lpservices.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/netlib/netlib.cpp b/src/modules/netlib/netlib.cpp index 10c87ad5c0..c42b43a89f 100644 --- a/src/modules/netlib/netlib.cpp +++ b/src/modules/netlib/netlib.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -59,7 +60,7 @@ int GetNetlibHandleType(void *p) }
__except(EXCEPTION_EXECUTE_HANDLER)
{}
-
+
return NLH_INVALID;
}
@@ -116,7 +117,7 @@ static INT_PTR GetNetlibUserSettingInt(const char *szUserModule, const char *szS DBVARIANT dbv;
if (db_get(NULL, szUserModule, szSetting, &dbv) && db_get(NULL, "Netlib", szSetting, &dbv))
return defValue;
-
+
if (dbv.type == DBVT_BYTE) return dbv.bVal;
if (dbv.type == DBVT_WORD) return dbv.wVal;
return dbv.dVal;
diff --git a/src/modules/netlib/netlib.h b/src/modules/netlib/netlib.h index 0108604f6b..fa887e91a3 100644 --- a/src/modules/netlib/netlib.h +++ b/src/modules/netlib/netlib.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/netlib/netlibautoproxy.cpp b/src/modules/netlib/netlibautoproxy.cpp index 68a433c6c7..f0cf323776 100644 --- a/src/modules/netlib/netlibautoproxy.cpp +++ b/src/modules/netlib/netlibautoproxy.cpp @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2010-2011 Miranda IM project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/netlib/netlibbind.cpp b/src/modules/netlib/netlibbind.cpp index 10ac9b3725..2c2ebf1530 100644 --- a/src/modules/netlib/netlibbind.cpp +++ b/src/modules/netlib/netlibbind.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/netlib/netlibhttp.cpp b/src/modules/netlib/netlibhttp.cpp index 1022e63e69..d1d231d7a3 100644 --- a/src/modules/netlib/netlibhttp.cpp +++ b/src/modules/netlib/netlibhttp.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -549,7 +550,7 @@ INT_PTR NetlibHttpSendRequest(WPARAM wParam, LPARAM lParam) int resultCode = nlhr->resultCode;
lastFirstLineFail = false;
- DWORD hflags = (nlhr->flags & (NLHRF_NODUMP|NLHRF_NODUMPHEADERS|NLHRF_NODUMPSEND) ?
+ DWORD hflags = (nlhr->flags & (NLHRF_NODUMP|NLHRF_NODUMPHEADERS|NLHRF_NODUMPSEND) ?
MSG_NODUMP : (nlhr->flags & NLHRF_DUMPPROXY ? MSG_DUMPPROXY : 0)) |
(nlhr->flags & NLHRF_NOPROXY ? MSG_RAW : 0);
@@ -603,7 +604,7 @@ INT_PTR NetlibHttpSendRequest(WPARAM wParam, LPARAM lParam) break;
}
}
- else if (resultCode == 401 && !doneAuthHeader) { //auth required
+ else if (resultCode == 401 && !doneAuthHeader) { //auth required
if (nlhr->requestType == REQUEST_HEAD)
nlhrReply = (NETLIBHTTPREQUEST*)NetlibHttpRecvHeaders((WPARAM)nlc, hflags);
else
diff --git a/src/modules/netlib/netlibhttpproxy.cpp b/src/modules/netlib/netlibhttpproxy.cpp index efcaca9e3b..aebf65ee55 100644 --- a/src/modules/netlib/netlibhttpproxy.cpp +++ b/src/modules/netlib/netlibhttpproxy.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/netlib/netliblog.cpp b/src/modules/netlib/netliblog.cpp index 878289e826..99f0aff8ba 100644 --- a/src/modules/netlib/netliblog.cpp +++ b/src/modules/netlib/netliblog.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -56,11 +57,11 @@ static int bIsActive = TRUE; static HANDLE hLogEvent = NULL;
static HANDLE hLogger = NULL;
-static const TCHAR* szTimeFormats[] =
+static const TCHAR* szTimeFormats[] =
{
- LPGENT("No times"),
- LPGENT("Standard hh:mm:ss times"),
- LPGENT("Times in milliseconds"),
+ LPGENT("No times"),
+ LPGENT("Standard hh:mm:ss times"),
+ LPGENT("Times in milliseconds"),
LPGENT("Times in microseconds")
};
@@ -335,21 +336,21 @@ static INT_PTR NetlibLog(WPARAM wParam, LPARAM lParam) dwOriginalLastError = GetLastError();
switch (logOptions.timeFormat) {
case TIMEFORMAT_HHMMSS:
- GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_FORCE24HOURFORMAT | TIME_NOTIMEMARKER,
+ GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_FORCE24HOURFORMAT | TIME_NOTIMEMARKER,
NULL, NULL, szTime, SIZEOF(szTime));
break;
case TIMEFORMAT_MILLISECONDS:
QueryPerformanceCounter(&liTimeNow);
liTimeNow.QuadPart -= mirandaStartTime;
- mir_snprintf(szTime, SIZEOF(szTime), "%I64u.%03I64u", liTimeNow.QuadPart / perfCounterFreq,
+ mir_snprintf(szTime, SIZEOF(szTime), "%I64u.%03I64u", liTimeNow.QuadPart / perfCounterFreq,
1000 * (liTimeNow.QuadPart % perfCounterFreq) / perfCounterFreq);
break;
case TIMEFORMAT_MICROSECONDS:
QueryPerformanceCounter(&liTimeNow);
liTimeNow.QuadPart -= mirandaStartTime;
- mir_snprintf(szTime, SIZEOF(szTime), "%I64u.%06I64u", liTimeNow.QuadPart / perfCounterFreq,
+ mir_snprintf(szTime, SIZEOF(szTime), "%I64u.%06I64u", liTimeNow.QuadPart / perfCounterFreq,
1000000 * (liTimeNow.QuadPart % perfCounterFreq) / perfCounterFreq);
break;
@@ -358,8 +359,8 @@ static INT_PTR NetlibLog(WPARAM wParam, LPARAM lParam) break;
}
if (logOptions.timeFormat || logOptions.showUser)
- mir_snprintf(szHead, SIZEOF(szHead) - 1, "[%s%s%s] ", szTime,
- (logOptions.showUser && logOptions.timeFormat) ? " " : "",
+ mir_snprintf(szHead, SIZEOF(szHead) - 1, "[%s%s%s] ", szTime,
+ (logOptions.showUser && logOptions.timeFormat) ? " " : "",
logOptions.showUser ? nlu->user.szSettingsModule : "");
else
szHead[0] = 0;
@@ -437,7 +438,7 @@ void NetlibDumpData(NetlibConnection *nlc, PBYTE buf, int len, int sent, int fla WaitForSingleObject(hConnectionHeaderMutex, INFINITE);
NetlibUser *nlu = nlc ? nlc->nlu : NULL;
- int titleLineLen = mir_snprintf(szTitleLine, SIZEOF(szTitleLine), "(%p:%u) Data %s%s\r\n",
+ int titleLineLen = mir_snprintf(szTitleLine, SIZEOF(szTitleLine), "(%p:%u) Data %s%s\r\n",
nlc, nlc ? nlc->s : 0, sent ? "sent" : "received", flags & MSG_DUMPPROXY ? " (proxy)" : "");
ReleaseMutex(hConnectionHeaderMutex);
@@ -488,7 +489,7 @@ void NetlibDumpData(NetlibConnection *nlc, PBYTE buf, int len, int sent, int fla if (colsInLine == 16) {
PBYTE p = buf + line;
pszBuf += wsprintfA(
- pszBuf, "%08X: %02X %02X %02X %02X-%02X %02X %02X %02X-%02X %02X %02X %02X-%02X %02X %02X %02X ",
+ pszBuf, "%08X: %02X %02X %02X %02X-%02X %02X %02X %02X-%02X %02X %02X %02X-%02X %02X %02X %02X ",
line, p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]); //!!!!!!!!!!
}
else {
diff --git a/src/modules/netlib/netlibopenconn.cpp b/src/modules/netlib/netlibopenconn.cpp index b8d0f440e5..1f2530f8f4 100644 --- a/src/modules/netlib/netlibopenconn.cpp +++ b/src/modules/netlib/netlibopenconn.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/netlib/netlibopts.cpp b/src/modules/netlib/netlibopts.cpp index 67a67c5b2a..208921475d 100644 --- a/src/modules/netlib/netlibopts.cpp +++ b/src/modules/netlib/netlibopts.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/netlib/netlibpktrecver.cpp b/src/modules/netlib/netlibpktrecver.cpp index aa41bf6c8a..99a6dcb7c1 100644 --- a/src/modules/netlib/netlibpktrecver.cpp +++ b/src/modules/netlib/netlibpktrecver.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/netlib/netlibsecurity.cpp b/src/modules/netlib/netlibsecurity.cpp index 396d3a4387..5dcb11d5ab 100644 --- a/src/modules/netlib/netlibsecurity.cpp +++ b/src/modules/netlib/netlibsecurity.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/netlib/netlibsock.cpp b/src/modules/netlib/netlibsock.cpp index c88715da50..1bb6a2b936 100644 --- a/src/modules/netlib/netlibsock.cpp +++ b/src/modules/netlib/netlibsock.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -227,7 +228,7 @@ char* NetlibAddressToString(SOCKADDR_INET_M* addr) DWORD len = sizeof(saddr);
if ( !WSAAddressToStringA((PSOCKADDR)addr, sizeof(*addr), NULL, saddr, &len))
return mir_strdup(saddr);
-
+
if (addr->si_family == AF_INET) {
char *szIp = inet_ntoa(addr->Ipv4.sin_addr);
if (addr->Ipv4.sin_port != 0) {
diff --git a/src/modules/netlib/netlibssl.cpp b/src/modules/netlib/netlibssl.cpp index 926a952bff..7f952b3ab6 100644 --- a/src/modules/netlib/netlibssl.cpp +++ b/src/modules/netlib/netlibssl.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -35,7 +36,7 @@ typedef BOOL (* SSL_EMPTY_CACHE_FN_M)(VOID); static HMODULE g_hSchannel;
static PSecurityFunctionTableA g_pSSPI;
-static HANDLE g_hSslMutex;
+static HANDLE g_hSslMutex;
static SSL_EMPTY_CACHE_FN_M MySslEmptyCache;
static CredHandle hCreds;
static bool bSslInitDone;
@@ -54,8 +55,8 @@ static pfnCertVerifyCertificateChainPolicy fnCertVerifyCertificateChainPolicy; typedef enum
{
- sockOpen,
- sockClosed,
+ sockOpen,
+ sockClosed,
sockError
} SocketState;
@@ -74,7 +75,7 @@ struct SslHandle int cbIoBuffer;
int sbIoBuffer;
- SocketState state;
+ SocketState state;
};
static void ReportSslError(SECURITY_STATUS scRet, int line, bool showPopup = false)
@@ -96,7 +97,7 @@ static void ReportSslError(SECURITY_STATUS scRet, int line, bool showPopup = fal break;
default:
- FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+ FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, scRet, LANG_USER_DEFAULT, szMsgBuf, SIZEOF(szMsgBuf), NULL);
}
@@ -126,7 +127,7 @@ static bool AcquireCredentials(void) // Create an SSPI credential.
scRet = g_pSSPI->AcquireCredentialsHandleA(
- NULL, // Name of principal
+ NULL, // Name of principal
UNISP_NAME_A, // Name of package
SECPKG_CRED_OUTBOUND, // Flags indicating use
NULL, // Pointer to logon ID
@@ -144,7 +145,7 @@ static bool SSL_library_init(void) {
if (bSslInitDone) return true;
- WaitForSingleObject(g_hSslMutex, INFINITE);
+ WaitForSingleObject(g_hSslMutex, INFINITE);
if ( !bSslInitDone)
{
@@ -205,11 +206,11 @@ static bool VerifyCertificate(SslHandle *ssl, PCSTR pszServerName, DWORD dwCertF if ( !fnCertGetCertificateChain)
return true;
- static LPSTR rgszUsages[] =
- {
- szOID_PKIX_KP_SERVER_AUTH,
- szOID_SERVER_GATED_CRYPTO,
- szOID_SGC_NETSCAPE
+ static LPSTR rgszUsages[] =
+ {
+ szOID_PKIX_KP_SERVER_AUTH,
+ szOID_SERVER_GATED_CRYPTO,
+ szOID_SGC_NETSCAPE
};
CERT_CHAIN_PARA ChainPara = {0};
@@ -222,7 +223,7 @@ static bool VerifyCertificate(SslHandle *ssl, PCSTR pszServerName, DWORD dwCertF PWSTR pwszServerName = mir_a2u(pszServerName);
- scRet = g_pSSPI->QueryContextAttributesA(&ssl->hContext,
+ scRet = g_pSSPI->QueryContextAttributesA(&ssl->hContext,
SECPKG_ATTR_REMOTE_CERT_CONTEXT, &pServerCert);
if (scRet != SEC_E_OK)
goto cleanup;
@@ -238,7 +239,7 @@ static bool VerifyCertificate(SslHandle *ssl, PCSTR pszServerName, DWORD dwCertF ChainPara.RequestedUsage.Usage.cUsageIdentifier = SIZEOF(rgszUsages);
ChainPara.RequestedUsage.Usage.rgpszUsageIdentifier = rgszUsages;
- if ( !fnCertGetCertificateChain(NULL, pServerCert, NULL, pServerCert->hCertStore,
+ if ( !fnCertGetCertificateChain(NULL, pServerCert, NULL, pServerCert->hCertStore,
&ChainPara, 0, NULL, &pChainContext))
{
scRet = GetLastError();
@@ -255,7 +256,7 @@ static bool VerifyCertificate(SslHandle *ssl, PCSTR pszServerName, DWORD dwCertF PolicyStatus.cbSize = sizeof(PolicyStatus);
- if ( !fnCertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_SSL, pChainContext,
+ if ( !fnCertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_SSL, pChainContext,
&PolicyPara, &PolicyStatus))
{
scRet = GetLastError();
@@ -281,7 +282,7 @@ cleanup: return scRet == SEC_E_OK;
}
-static SECURITY_STATUS ClientHandshakeLoop(SslHandle *ssl, BOOL fDoInitialRead)
+static SECURITY_STATUS ClientHandshakeLoop(SslHandle *ssl, BOOL fDoInitialRead)
{
SecBufferDesc InBuffer;
SecBuffer InBuffers[2];
@@ -295,7 +296,7 @@ static SECURITY_STATUS ClientHandshakeLoop(SslHandle *ssl, BOOL fDoInitialRead) BOOL fDoRead;
- dwSSPIFlags =
+ dwSSPIFlags =
ISC_REQ_SEQUENCE_DETECT |
ISC_REQ_REPLAY_DETECT |
ISC_REQ_CONFIDENTIALITY |
@@ -310,7 +311,7 @@ static SECURITY_STATUS ClientHandshakeLoop(SslHandle *ssl, BOOL fDoInitialRead) scRet = SEC_I_CONTINUE_NEEDED;
// Loop until the handshake is finished or an error occurs.
- while (scRet == SEC_I_CONTINUE_NEEDED || scRet == SEC_E_INCOMPLETE_MESSAGE || scRet == SEC_I_INCOMPLETE_CREDENTIALS)
+ while (scRet == SEC_I_CONTINUE_NEEDED || scRet == SEC_E_INCOMPLETE_MESSAGE || scRet == SEC_I_INCOMPLETE_CREDENTIALS)
{
// Read server data
if (0 == ssl->cbIoBuffer || scRet == SEC_E_INCOMPLETE_MESSAGE)
@@ -386,23 +387,23 @@ static SECURITY_STATUS ClientHandshakeLoop(SslHandle *ssl, BOOL fDoInitialRead) OutBuffer.ulVersion = SECBUFFER_VERSION;
scRet = g_pSSPI->InitializeSecurityContextA(
- &hCreds,
- &ssl->hContext,
- NULL,
- dwSSPIFlags,
- 0,
- SECURITY_NATIVE_DREP,
- &InBuffer,
- 0,
- NULL,
- &OutBuffer,
- &dwSSPIOutFlags,
+ &hCreds,
+ &ssl->hContext,
+ NULL,
+ dwSSPIFlags,
+ 0,
+ SECURITY_NATIVE_DREP,
+ &InBuffer,
+ 0,
+ NULL,
+ &OutBuffer,
+ &dwSSPIOutFlags,
&tsExpiry);
- // If success (or if the error was one of the special extended ones),
+ // If success (or if the error was one of the special extended ones),
// send the contents of the output buffer to the server.
- if (scRet == SEC_E_OK ||
- scRet == SEC_I_CONTINUE_NEEDED ||
+ if (scRet == SEC_E_OK ||
+ scRet == SEC_I_CONTINUE_NEEDED ||
(FAILED(scRet) && (dwSSPIOutFlags & ISC_RET_EXTENDED_ERROR)))
{
if (OutBuffers[0].cbBuffer != 0 && OutBuffers[0].pvBuffer != NULL)
@@ -431,8 +432,8 @@ static SECURITY_STATUS ClientHandshakeLoop(SslHandle *ssl, BOOL fDoInitialRead) // Store remaining data for further use
if (InBuffers[1].BufferType == SECBUFFER_EXTRA)
{
- memmove(ssl->pbIoBuffer,
- ssl->pbIoBuffer + (ssl->cbIoBuffer - InBuffers[1].cbBuffer),
+ memmove(ssl->pbIoBuffer,
+ ssl->pbIoBuffer + (ssl->cbIoBuffer - InBuffers[1].cbBuffer),
InBuffers[1].cbBuffer);
ssl->cbIoBuffer = InBuffers[1].cbBuffer;
}
@@ -444,7 +445,7 @@ static SECURITY_STATUS ClientHandshakeLoop(SslHandle *ssl, BOOL fDoInitialRead) // Check for fatal error.
if (FAILED(scRet)) break;
- // server just requested client authentication.
+ // server just requested client authentication.
if (scRet == SEC_I_INCOMPLETE_CREDENTIALS)
{
// Server has requested client authentication and
@@ -459,8 +460,8 @@ static SECURITY_STATUS ClientHandshakeLoop(SslHandle *ssl, BOOL fDoInitialRead) // Copy any leftover data from the buffer, and go around again.
if (InBuffers[1].BufferType == SECBUFFER_EXTRA)
{
- memmove(ssl->pbIoBuffer,
- ssl->pbIoBuffer + (ssl->cbIoBuffer - InBuffers[1].cbBuffer),
+ memmove(ssl->pbIoBuffer,
+ ssl->pbIoBuffer + (ssl->cbIoBuffer - InBuffers[1].cbBuffer),
InBuffers[1].cbBuffer);
ssl->cbIoBuffer = InBuffers[1].cbBuffer;
@@ -517,17 +518,17 @@ static bool ClientConnect(SslHandle *ssl, const char *host) OutBuffer.ulVersion = SECBUFFER_VERSION;
scRet = g_pSSPI->InitializeSecurityContextA(
- &hCreds,
- NULL,
- (SEC_CHAR*)host,
- dwSSPIFlags,
- 0,
- SECURITY_NATIVE_DREP,
- NULL,
- 0,
- &ssl->hContext,
- &OutBuffer,
- &dwSSPIOutFlags,
+ &hCreds,
+ NULL,
+ (SEC_CHAR*)host,
+ dwSSPIFlags,
+ 0,
+ SECURITY_NATIVE_DREP,
+ NULL,
+ 0,
+ &ssl->hContext,
+ &OutBuffer,
+ &dwSSPIOutFlags,
&tsExpiry);
if (scRet != SEC_I_CONTINUE_NEEDED)
@@ -541,7 +542,7 @@ static bool ClientConnect(SslHandle *ssl, const char *host) {
NetlibDumpData(NULL, (unsigned char*)(OutBuffers[0].pvBuffer), OutBuffers[0].cbBuffer, 1, MSG_DUMPSSL);
cbData = send(ssl->s, (char*)OutBuffers[0].pvBuffer, OutBuffers[0].cbBuffer, 0);
- if (cbData == SOCKET_ERROR || cbData == 0)
+ if (cbData == SOCKET_ERROR || cbData == 0)
{
NetlibLogf(NULL, "SSL failure sending connection data (%d %d)", ssl->s, WSAGetLastError());
g_pSSPI->FreeContextBuffer(OutBuffers[0].pvBuffer);
@@ -628,17 +629,17 @@ void NetlibSslShutdown(SslHandle *ssl) OutBuffer.ulVersion = SECBUFFER_VERSION;
scRet = g_pSSPI->InitializeSecurityContextA(
- &hCreds,
- &ssl->hContext,
- NULL,
- dwSSPIFlags,
- 0,
- SECURITY_NATIVE_DREP,
- NULL,
- 0,
- &ssl->hContext,
- &OutBuffer,
- &dwSSPIOutFlags,
+ &hCreds,
+ &ssl->hContext,
+ NULL,
+ dwSSPIFlags,
+ 0,
+ SECURITY_NATIVE_DREP,
+ NULL,
+ 0,
+ &ssl->hContext,
+ &OutBuffer,
+ &dwSSPIOutFlags,
&tsExpiry);
if (FAILED(scRet)) return;
@@ -858,7 +859,7 @@ int NetlibSslRead(SslHandle *ssl, char *buf, int num, int peek) // sequence.
scRet = ClientHandshakeLoop(ssl, FALSE);
- if (scRet != SEC_E_OK)
+ if (scRet != SEC_E_OK)
{
ssl->state = sockError;
return NetlibSslReadSetResult(ssl, buf, num, peek);
@@ -922,7 +923,7 @@ int NetlibSslWrite(SslHandle *ssl, const char *buf, int num) if (FAILED(scRet)) break;
- // Calculate encrypted packet size
+ // Calculate encrypted packet size
cbData = Buffers[0].cbBuffer + Buffers[1].cbBuffer + Buffers[2].cbBuffer;
// Send the encrypted data to the server.
@@ -963,7 +964,7 @@ static INT_PTR GetSslApi(WPARAM, LPARAM lParam) int LoadSslModule(void)
{
CreateServiceFunction(MS_SYSTEM_GET_SI, GetSslApi);
- g_hSslMutex = CreateMutex(NULL, FALSE, NULL);
+ g_hSslMutex = CreateMutex(NULL, FALSE, NULL);
SecInvalidateHandle(&hCreds);
return 0;
diff --git a/src/modules/netlib/netlibupnp.cpp b/src/modules/netlib/netlibupnp.cpp index d11917c9b5..c0364adbbb 100644 --- a/src/modules/netlib/netlibupnp.cpp +++ b/src/modules/netlib/netlibupnp.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/options/descbutton.cpp b/src/modules/options/descbutton.cpp index b9875b1ee6..fe0aba9319 100644 --- a/src/modules/options/descbutton.cpp +++ b/src/modules/options/descbutton.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2007 Artem Shpynov
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+Copyright (c) 2007 Artem Shpynov
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/options/filter.cpp b/src/modules/options/filter.cpp index f52598d17b..d9e9f29c33 100644 --- a/src/modules/options/filter.cpp +++ b/src/modules/options/filter.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -46,7 +47,7 @@ void ClearFilterStrings() BOOL ContainsFilterString(const PageHash key, TCHAR *data)
{
CPageKeywords* values = filterStrings[key];
- return (values) ? values->ContainsString(data) : FALSE;
+ return (values) ? values->ContainsString(data) : FALSE;
}
void AddTreeViewNodes(HWND hWndDlg, PageHash key, HTREEITEM root)
@@ -119,7 +120,7 @@ void AddDialogString(HWND hWndDlg, const PageHash key) }
if (lstrcmpi(szClass, _T("combobox")) == 0) {
- if (GetWindowStyle(hWndDlg) & CBS_HASSTRINGS) {
+ if (GetWindowStyle(hWndDlg) & CBS_HASSTRINGS) {
int count = ComboBox_GetCount(hWndDlg);
for (int i=0; i < count; i++) {
title[0] = 0; //safety
diff --git a/src/modules/options/filter.h b/src/modules/options/filter.h index df81e247ce..afe04fc50b 100644 --- a/src/modules/options/filter.h +++ b/src/modules/options/filter.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -70,12 +71,12 @@ public: BOOL ContainsString(TCHAR *data)
{
for (int i=0; i < _pageKeyWords.getCount(); i++)
- if (_tcsstr(_pageKeyWords[i], data))
+ if (_tcsstr(_pageKeyWords[i], data))
return TRUE;
return FALSE;
}
static int PageSortFunc(const CPageKeywords* p1, const CPageKeywords* p2)
- {
+ {
if (p1->_pageHashKey < p2->_pageHashKey) { return -1; }
else if (p1->_pageHashKey > p2->_pageHashKey) { return 1; }
return 0;
@@ -96,4 +97,3 @@ public: };
#endif //M_OPTIONS_FILTERING_H
-
diff --git a/src/modules/options/headerbar.cpp b/src/modules/options/headerbar.cpp index f4fdec8745..ee26fde856 100644 --- a/src/modules/options/headerbar.cpp +++ b/src/modules/options/headerbar.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2007 Artem Shpynov
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+Copyright (c) 2007 Artem Shpynov
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/options/iconheader.cpp b/src/modules/options/iconheader.cpp index ab23c41d2e..8523481fe2 100644 --- a/src/modules/options/iconheader.cpp +++ b/src/modules/options/iconheader.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2007 Artem Shpynov
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+Copyright (c) 2007 Artem Shpynov
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp index 4cd938183f..0239c10aa5 100644 --- a/src/modules/options/options.cpp +++ b/src/modules/options/options.cpp @@ -1,8 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+Copyright (c) 2007 Artem Shpynov
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/plugins/dll_sniffer.cpp b/src/modules/plugins/dll_sniffer.cpp index 7092b8dc4d..b3345a39c8 100644 --- a/src/modules/plugins/dll_sniffer.cpp +++ b/src/modules/plugins/dll_sniffer.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp index 0e799b933c..f61710c09b 100644 --- a/src/modules/plugins/newplugins.cpp +++ b/src/modules/plugins/newplugins.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/plugins/pluginopts.cpp b/src/modules/plugins/pluginopts.cpp index 4190ec275a..a79c532074 100644 --- a/src/modules/plugins/pluginopts.cpp +++ b/src/modules/plugins/pluginopts.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -202,7 +203,7 @@ static bool UnloadPluginDynamically(PluginListItemData *dat) if (p) {
if ( !Plugin_UnloadDyn(p))
return false;
-
+
dat->hInst = NULL;
}
return true;
@@ -218,7 +219,7 @@ static LRESULT CALLBACK PluginListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LP }
else {
szFilter.AppendChar(wParam);
-
+
for (int i = 0; i < arPluginList.getCount(); i++) {
PluginListItemData *p = arPluginList[i];
if (!_tcsnicmp(szFilter, p->fileName, szFilter.GetLength())) {
@@ -383,7 +384,7 @@ INT_PTR CALLBACK DlgPluginOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar return FALSE;
}
// find all another standard plugins by mask and disable them
- if ((hdr->uNewState == 0x2000) && dat->stdPlugin != 0)
+ if ((hdr->uNewState == 0x2000) && dat->stdPlugin != 0)
for (int iRow = 0; iRow != -1; iRow = ListView_GetNextItem(hwndList, iRow, LVNI_ALL)) {
if (iRow == hdr->iItem) // skip the plugin we're standing on
continue;
diff --git a/src/modules/protocols/protoaccs.cpp b/src/modules/protocols/protoaccs.cpp index 5cfd87c053..aed4ae4c62 100644 --- a/src/modules/protocols/protoaccs.cpp +++ b/src/modules/protocols/protoaccs.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -337,7 +338,7 @@ static INT_PTR stub16(PROTO_INTERFACE* ppi, WPARAM, LPARAM lParam) static INT_PTR stub17(PROTO_INTERFACE* ppi, WPARAM, LPARAM lParam)
{
PROTOSEARCHBYNAME* psbn = (PROTOSEARCHBYNAME*)lParam;
- return (INT_PTR)ppi->SearchByName(StrConvT((char*)psbn->pszNick),
+ return (INT_PTR)ppi->SearchByName(StrConvT((char*)psbn->pszNick),
StrConvT((char*)psbn->pszFirstName), StrConvT((char*)psbn->pszLastName));
}
diff --git a/src/modules/protocols/protochains.cpp b/src/modules/protocols/protochains.cpp index f614fd50e2..95392c4331 100644 --- a/src/modules/protocols/protochains.cpp +++ b/src/modules/protocols/protochains.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp index bc401e4449..3de239ebbb 100644 --- a/src/modules/protocols/protocols.cpp +++ b/src/modules/protocols/protocols.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/protocols/protodir.cpp b/src/modules/protocols/protodir.cpp index f5f82bc304..7d01fa56ce 100644 --- a/src/modules/protocols/protodir.cpp +++ b/src/modules/protocols/protodir.cpp @@ -1,9 +1,10 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-2005 Miranda IM project,
-all portions of this codebase are copyrighted to the people
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
listed in contributors.txt.
This program is free software; you can redistribute it and/or
@@ -124,7 +125,7 @@ char * contactDir_Proto_Get(contactDir * cd, HANDLE hContact) e.proto="";
e.id="";
EnterCriticalSection(&cd->csLock);
- if ( List_GetIndex(&cd->protoCache, &e, &index) ) {
+ if ( List_GetIndex(&cd->protoCache, &e, &index) ) {
contactEntry * p = cd->protoCache.items[index];
szCache = p->proto;
}
@@ -220,7 +221,7 @@ static int contactDirGetProto(WPARAM wParam, LPARAM lParam) return (int) contactDir_Proto_Get(&condir,(HANDLE)wParam);
}
-#endif
+#endif
void InitContactDir(void)
{
diff --git a/src/modules/protocols/protoint.cpp b/src/modules/protocols/protoint.cpp index abe590f541..ba6e40f01e 100644 --- a/src/modules/protocols/protoint.cpp +++ b/src/modules/protocols/protoint.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -75,7 +76,7 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE int __cdecl AuthRequest(HANDLE hContact, const TCHAR* szMessage)
{
CCSDATA ccs = { hContact, PSS_AUTHREQUEST, 0, (LPARAM)szMessage };
- ccs.lParam = (LPARAM)mir_t2a(szMessage);
+ ccs.lParam = (LPARAM)mir_t2a(szMessage);
int res = (int)ProtoCallService(m_szModuleName, PSS_AUTHREQUEST, 0, (LPARAM)&ccs);
mir_free((char*)ccs.lParam);
return res;
@@ -90,7 +91,7 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE {
CCSDATA ccs = { hContact, PSS_FILEALLOW, (WPARAM)hTransfer, (LPARAM)szPath };
- ccs.lParam = (LPARAM)mir_t2a(szPath);
+ ccs.lParam = (LPARAM)mir_t2a(szPath);
HANDLE res = (HANDLE)ProtoCallService(m_szModuleName, PSS_FILEALLOW, 0, (LPARAM)&ccs);
mir_free((char*)ccs.lParam);
return res;
@@ -106,7 +107,7 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE {
CCSDATA ccs = { hContact, PSS_FILEDENY, (WPARAM)hTransfer, (LPARAM)szReason };
- ccs.lParam = (LPARAM)mir_t2a(szReason);
+ ccs.lParam = (LPARAM)mir_t2a(szReason);
int res = (int)ProtoCallService(m_szModuleName, PSS_FILEDENY, 0, (LPARAM)&ccs);
mir_free((char*)ccs.lParam);
return res;
diff --git a/src/modules/protocols/protoopts.cpp b/src/modules/protocols/protoopts.cpp index 522a77e616..eddded512c 100644 --- a/src/modules/protocols/protoopts.cpp +++ b/src/modules/protocols/protoopts.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -783,7 +784,7 @@ INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM if (dwStatus >= ID_STATUS_ONLINE) {
TCHAR buf[ 200 ];
mir_sntprintf(buf, SIZEOF(buf), TranslateT("Account %s is being disabled"), pa->tszAccountName);
- if (IDNO == ::MessageBox(hwndDlg,
+ if (IDNO == ::MessageBox(hwndDlg,
TranslateT("Account is online. Disable account?"),
buf, MB_ICONWARNING | MB_DEFBUTTON2 | MB_YESNO)) {
pa->bIsEnabled = 1; //stay enabled
@@ -854,7 +855,7 @@ INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM TCHAR buf[ 200 ];
mir_sntprintf(buf, SIZEOF(buf), TranslateT("Account %s is being deleted"), pa->tszAccountName);
if (pa->bOldProto) {
- MessageBox(NULL, TranslateT("You need to disable plugin to delete this account"), buf,
+ MessageBox(NULL, TranslateT("You need to disable plugin to delete this account"), buf,
MB_ICONERROR | MB_OK);
break;
}
diff --git a/src/modules/skin/hotkey_opts.cpp b/src/modules/skin/hotkey_opts.cpp index 6f524e422a..ef9f4fe690 100644 --- a/src/modules/skin/hotkey_opts.cpp +++ b/src/modules/skin/hotkey_opts.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/skin/hotkeys.cpp b/src/modules/skin/hotkeys.cpp index fc8ca86828..ea50fdb760 100644 --- a/src/modules/skin/hotkeys.cpp +++ b/src/modules/skin/hotkeys.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -101,7 +102,7 @@ static LRESULT CALLBACK sttKeyboardProc(int code, WPARAM wParam, LPARAM lParam) THotkeyItem *item = hotkeys[i];
if (item->type != HKT_LOCAL || !item->Enabled)
continue;
-
+
BYTE hkMod, hkVk;
sttWordToModAndVk(item->Hotkey, &hkMod, &hkVk);
if (!hkVk) continue;
@@ -172,7 +173,7 @@ static INT_PTR svcHotkeyRegister(WPARAM wParam, LPARAM lParam) item->DefHotkey = desc->DefHotKey & ~HKF_MIRANDA_LOCAL;
item->Hotkey = db_get_w(NULL, DBMODULENAME, item->pszName, item->DefHotkey);
item->type = item->pszService ?
- (THotkeyType)db_get_b(NULL, DBMODULENAME "Types", item->pszName,
+ (THotkeyType)db_get_b(NULL, DBMODULENAME "Types", item->pszName,
(desc->DefHotKey & HKF_MIRANDA_LOCAL) ? HKT_LOCAL : HKT_GLOBAL) : HKT_MANUAL;
item->lParam = desc->lParam;
@@ -226,8 +227,8 @@ static INT_PTR svcHotkeyUnregister(WPARAM, LPARAM lParam) hotkeys[i]->pszName;
if ( !pszCurrentName) continue;
- hotkeys[i]->UnregisterHotkey =
- !lstrcmpA(pszCurrentName, pszName) ||
+ hotkeys[i]->UnregisterHotkey =
+ !lstrcmpA(pszCurrentName, pszName) ||
!strncmp(pszCurrentName, pszNamePrefix, cbNamePrefix);
}
diff --git a/src/modules/skin/skin.h b/src/modules/skin/skin.h index b36472a0dd..6df14c02a8 100644 --- a/src/modules/skin/skin.h +++ b/src/modules/skin/skin.h @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/skin/skinicons.cpp b/src/modules/skin/skinicons.cpp index 777d2186a8..37366da353 100644 --- a/src/modules/skin/skinicons.cpp +++ b/src/modules/skin/skinicons.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -33,7 +34,7 @@ struct StandardIconDescription HANDLE hIcolib;
};
-static struct StandardIconDescription mainIcons[] =
+static struct StandardIconDescription mainIcons[] =
{
{ SKINICON_OTHER_MIRANDA, LPGEN("Miranda NG"), -IDI_MIRANDA }, // 0
{ SKINICON_EVENT_MESSAGE, LPGEN("Message"), -IDI_RECVMSG }, // 1
@@ -88,20 +89,20 @@ static struct StandardIconDescription mainIcons[] = { SKINICON_AUTH_REVOKE, LPGEN("Revoke authorization"), -IDI_AUTH_REVOKE }, // 50
{ SKINICON_OTHER_VISIBLE_ALL, LPGEN("Always visible"), -IDI_ALWAYSVIS, 0, LPGEN("Contact list") },
{ SKINICON_OTHER_INVISIBLE_ALL, LPGEN("Always invisible"), -IDI_NEVERVIS, 0, LPGEN("Contact list") },
- { SKINICON_OTHER_STATUS_LOCKED, LPGEN("Locked status"), -IDI_STATUS_LOCKED, 0, LPGEN("Status icons") },
+ { SKINICON_OTHER_STATUS_LOCKED, LPGEN("Locked status"), -IDI_STATUS_LOCKED, 0, LPGEN("Status icons") },
};
-static struct StandardIconDescription statusIcons[] =
+static struct StandardIconDescription statusIcons[] =
{
- { ID_STATUS_OFFLINE, LPGEN("Offline"), -IDI_OFFLINE, 0xFFFFFFFF },
- { ID_STATUS_ONLINE, LPGEN("Online"), -IDI_ONLINE, PF2_ONLINE },
- { ID_STATUS_AWAY, LPGEN("Away"), -IDI_AWAY, PF2_SHORTAWAY },
- { ID_STATUS_NA, LPGEN("NA"), -IDI_NA, PF2_LONGAWAY },
- { ID_STATUS_OCCUPIED, LPGEN("Occupied"), -IDI_OCCUPIED, PF2_LIGHTDND },
- { ID_STATUS_DND, LPGEN("DND"), -IDI_DND, PF2_HEAVYDND },
- { ID_STATUS_FREECHAT, LPGEN("Free for chat"), -IDI_FREE4CHAT, PF2_FREECHAT },
- { ID_STATUS_INVISIBLE, LPGEN("Invisible"), -IDI_INVISIBLE, PF2_INVISIBLE },
- { ID_STATUS_ONTHEPHONE, LPGEN("On the phone"), -IDI_ONTHEPHONE, PF2_ONTHEPHONE },
+ { ID_STATUS_OFFLINE, LPGEN("Offline"), -IDI_OFFLINE, 0xFFFFFFFF },
+ { ID_STATUS_ONLINE, LPGEN("Online"), -IDI_ONLINE, PF2_ONLINE },
+ { ID_STATUS_AWAY, LPGEN("Away"), -IDI_AWAY, PF2_SHORTAWAY },
+ { ID_STATUS_NA, LPGEN("NA"), -IDI_NA, PF2_LONGAWAY },
+ { ID_STATUS_OCCUPIED, LPGEN("Occupied"), -IDI_OCCUPIED, PF2_LIGHTDND },
+ { ID_STATUS_DND, LPGEN("DND"), -IDI_DND, PF2_HEAVYDND },
+ { ID_STATUS_FREECHAT, LPGEN("Free for chat"), -IDI_FREE4CHAT, PF2_FREECHAT },
+ { ID_STATUS_INVISIBLE, LPGEN("Invisible"), -IDI_INVISIBLE, PF2_INVISIBLE },
+ { ID_STATUS_ONTHEPHONE, LPGEN("On the phone"), -IDI_ONTHEPHONE, PF2_ONTHEPHONE },
{ ID_STATUS_OUTTOLUNCH, LPGEN("Out to lunch"), -IDI_OUTTOLUNCH, PF2_OUTTOLUNCH }
};
@@ -316,7 +317,7 @@ HICON LoadSkinProtoIcon(const char* szProto, int status, bool big) sid.ptszDescription = cli.pfnGetStatusModeDescription(statusIcons[i].id, 0);
sid.iDefaultIndex = statusIcons[i].resource_id;
IcoLib_AddNewIcon(0, &sid);
- }
+ }
}
// format: core_status_%s%d
diff --git a/src/modules/skin/sounds.cpp b/src/modules/skin/sounds.cpp index da3cc18f55..1641e595aa 100644 --- a/src/modules/skin/sounds.cpp +++ b/src/modules/skin/sounds.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -78,7 +79,7 @@ static INT_PTR ServiceSkinAddNewSound(WPARAM wParam, LPARAM lParam) item->ptszTempFile = NULL;
item->hLangpack = (int)wParam;
arSounds.insert(item);
-
+
TCHAR* ptszDefaultFile;
if (ssd->dwFlags & SSDF_UNICODE) {
item->ptszDescription = mir_tstrdup(ssd->ptszDescription);
@@ -310,7 +311,7 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM ofn.hwndOwner = GetParent(hwndDlg);
ofn.hInstance = NULL;
ofn.lpstrFilter = filter;
-
+
TCHAR* slash = _tcsrchr(strdir, '\\');
if (slash) {
*slash = 0;
@@ -420,7 +421,7 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
}
break;
- }
+ }
}
break;
diff --git a/src/modules/srmm/statusicon.cpp b/src/modules/srmm/statusicon.cpp index c42b7fbe46..08107d9cc6 100644 --- a/src/modules/srmm/statusicon.cpp +++ b/src/modules/srmm/statusicon.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright (C) 2012-13 Miranda NG project,
+Copyright (C) 2012-14 Miranda NG project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/utils/bmpfilter.cpp b/src/modules/utils/bmpfilter.cpp index 60a8a871f0..e7f479e668 100644 --- a/src/modules/utils/bmpfilter.cpp +++ b/src/modules/utils/bmpfilter.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/utils/colourpicker.cpp b/src/modules/utils/colourpicker.cpp index 1c7ec449de..d2661d50fc 100644 --- a/src/modules/utils/colourpicker.cpp +++ b/src/modules/utils/colourpicker.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/utils/hyperlink.cpp b/src/modules/utils/hyperlink.cpp index 23f7e151cb..86fa58689b 100644 --- a/src/modules/utils/hyperlink.cpp +++ b/src/modules/utils/hyperlink.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/utils/imgconv.cpp b/src/modules/utils/imgconv.cpp index 5267162025..03c585cc03 100644 --- a/src/modules/utils/imgconv.cpp +++ b/src/modules/utils/imgconv.cpp @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2010-12 Miranda IM, 2012-13 Miranda NG project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/utils/openurl.cpp b/src/modules/utils/openurl.cpp index b451421441..f9b6f4caff 100644 --- a/src/modules/utils/openurl.cpp +++ b/src/modules/utils/openurl.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/utils/path.cpp b/src/modules/utils/path.cpp index 3c55aafa4b..136c15c1bb 100644 --- a/src/modules/utils/path.cpp +++ b/src/modules/utils/path.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/utils/resizer.cpp b/src/modules/utils/resizer.cpp index 3eea6b0062..fc903239d7 100644 --- a/src/modules/utils/resizer.cpp +++ b/src/modules/utils/resizer.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/utils/timeutils.cpp b/src/modules/utils/timeutils.cpp index a27a65ee52..fd31e78a37 100644 --- a/src/modules/utils/timeutils.cpp +++ b/src/modules/utils/timeutils.cpp @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/utils/timezones.cpp b/src/modules/utils/timezones.cpp index 6fb8571823..6183dc151e 100644 --- a/src/modules/utils/timezones.cpp +++ b/src/modules/utils/timezones.cpp @@ -1,7 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
-Copyright 2010-12 Miranda IM, 2012-13 Miranda NG project,
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/utils/utils.cpp b/src/modules/utils/utils.cpp index ed9a59c9a4..33c95995bd 100644 --- a/src/modules/utils/utils.cpp +++ b/src/modules/utils/utils.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/utils/windowlist.cpp b/src/modules/utils/windowlist.cpp index 4453048f36..dfea007733 100644 --- a/src/modules/utils/windowlist.cpp +++ b/src/modules/utils/windowlist.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/visibility/visibility.cpp b/src/modules/visibility/visibility.cpp index 0bd0c007c0..be0a51998f 100644 --- a/src/modules/visibility/visibility.cpp +++ b/src/modules/visibility/visibility.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/modules/xml/xmlApi.cpp b/src/modules/xml/xmlApi.cpp index b010d182d9..08b050218a 100644 --- a/src/modules/xml/xmlApi.cpp +++ b/src/modules/xml/xmlApi.cpp @@ -1,8 +1,9 @@ /*
-Miranda IM: the free IM client for Microsoft* Windows*
+Miranda NG: the free IM client for Microsoft* Windows*
-Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project,
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -11,7 +12,7 @@ modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/src/version.rc b/src/version.rc index 810286bce8..6525e4b1b8 100644 --- a/src/version.rc +++ b/src/version.rc @@ -35,7 +35,7 @@ BEGIN VALUE "FileDescription", "Miranda NG\0"
VALUE "FileVersion", MIRANDA_VERSION_DISPLAY
VALUE "InternalName", "miranda32\0"
- VALUE "LegalCopyright", "Copyright © 2000-11 Miranda IM, 2012-13 Miranda NG Project. This software is released under the terms of the GNU General Public License.\0"
+ VALUE "LegalCopyright", "Copyright © 2000-11 Miranda IM, 2012-14 Miranda NG project. This software is released under the terms of the GNU General Public License.\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "miranda32.exe\0"
VALUE "PrivateBuild", "\0"
|