From 020d7379f32065307f175fad18e1701920644187 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Mon, 18 May 2015 22:01:06 +0000 Subject: FavContacts: unified project git-svn-id: http://svn.miranda-ng.org/main/trunk@13689 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_dev.sln | 2 +- bin10/mir_full.sln | 2 +- bin10/mir_full_pro.sln | 2 +- bin12/mir_dev.sln | 2 +- bin12/mir_full.sln | 2 +- plugins/FavContacts/favcontacts.vcxproj | 28 +++ plugins/FavContacts/favcontacts.vcxproj.filters | 4 + plugins/FavContacts/favcontacts_10.vcxproj | 210 -------------------- plugins/FavContacts/favcontacts_10.vcxproj.filters | 80 -------- plugins/FavContacts/favcontacts_12.vcxproj | 213 --------------------- plugins/FavContacts/favcontacts_12.vcxproj.filters | 80 -------- plugins/FavContacts/src/contact_cache.cpp | 2 +- plugins/FavContacts/src/cserver.cpp | 2 +- plugins/FavContacts/src/csocket.cpp | 2 +- plugins/FavContacts/src/headers.h | 102 ---------- plugins/FavContacts/src/http_api.cpp | 2 +- plugins/FavContacts/src/main.cpp | 6 +- plugins/FavContacts/src/menu.cpp | 2 +- plugins/FavContacts/src/options.cpp | 4 +- plugins/FavContacts/src/services.cpp | 16 +- plugins/FavContacts/src/stdafx.cpp | 18 -- plugins/FavContacts/src/stdafx.cxx | 18 ++ plugins/FavContacts/src/stdafx.h | 102 ++++++++++ 23 files changed, 175 insertions(+), 726 deletions(-) create mode 100644 plugins/FavContacts/favcontacts.vcxproj create mode 100644 plugins/FavContacts/favcontacts.vcxproj.filters delete mode 100644 plugins/FavContacts/favcontacts_10.vcxproj delete mode 100644 plugins/FavContacts/favcontacts_10.vcxproj.filters delete mode 100644 plugins/FavContacts/favcontacts_12.vcxproj delete mode 100644 plugins/FavContacts/favcontacts_12.vcxproj.filters delete mode 100644 plugins/FavContacts/src/headers.h delete mode 100644 plugins/FavContacts/src/stdafx.cpp create mode 100644 plugins/FavContacts/src/stdafx.cxx create mode 100644 plugins/FavContacts/src/stdafx.h diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln index 71b3140250..e66fa99634 100644 --- a/bin10/mir_dev.sln +++ b/bin10/mir_dev.sln @@ -59,7 +59,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSList", "..\plugins\CSList EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Db_autobackups", "..\plugins\Db_autobackups\db_autobackups_10.vcxproj", "{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FavContacts", "..\plugins\FavContacts\favcontacts_10.vcxproj", "{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FavContacts", "..\plugins\FavContacts\favcontacts.vcxproj", "{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FltContacts", "..\plugins\FloatingContacts\FltCont_10.vcxproj", "{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}" EndProject diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index 5c2adabdc9..c10db4507b 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -59,7 +59,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSList", "..\plugins\CSList EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Db_autobackups", "..\plugins\Db_autobackups\db_autobackups_10.vcxproj", "{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FavContacts", "..\plugins\FavContacts\favcontacts_10.vcxproj", "{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FavContacts", "..\plugins\FavContacts\favcontacts.vcxproj", "{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FltContacts", "..\plugins\FloatingContacts\FltCont_10.vcxproj", "{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}" EndProject diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index 9196575b31..a9546882da 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -59,7 +59,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSList", "..\plugins\CSList EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Db_autobackups", "..\plugins\Db_autobackups\db_autobackups_10.vcxproj", "{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FavContacts", "..\plugins\FavContacts\favcontacts_10.vcxproj", "{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FavContacts", "..\plugins\FavContacts\favcontacts.vcxproj", "{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FltContacts", "..\plugins\FloatingContacts\FltCont_10.vcxproj", "{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}" EndProject diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln index e956816c86..3645e49f5c 100644 --- a/bin12/mir_dev.sln +++ b/bin12/mir_dev.sln @@ -61,7 +61,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSList", "..\plugins\CSList EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Db_autobackups", "..\plugins\Db_autobackups\db_autobackups_12.vcxproj", "{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FavContacts", "..\plugins\FavContacts\favcontacts_12.vcxproj", "{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FavContacts", "..\plugins\FavContacts\favcontacts.vcxproj", "{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FltContacts", "..\plugins\FloatingContacts\FltCont_12.vcxproj", "{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}" EndProject diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln index 6619a848c1..bb0f33a2d7 100644 --- a/bin12/mir_full.sln +++ b/bin12/mir_full.sln @@ -61,7 +61,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSList", "..\plugins\CSList EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Db_autobackups", "..\plugins\Db_autobackups\db_autobackups_12.vcxproj", "{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FavContacts", "..\plugins\FavContacts\favcontacts_12.vcxproj", "{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FavContacts", "..\plugins\FavContacts\favcontacts.vcxproj", "{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FltContacts", "..\plugins\FloatingContacts\FltCont_12.vcxproj", "{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}" EndProject diff --git a/plugins/FavContacts/favcontacts.vcxproj b/plugins/FavContacts/favcontacts.vcxproj new file mode 100644 index 0000000000..7358bd95d9 --- /dev/null +++ b/plugins/FavContacts/favcontacts.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + FavContacts + {2D0B4CB0-3ACA-4612-B745-FF3050E1500A} + + + + + \ No newline at end of file diff --git a/plugins/FavContacts/favcontacts.vcxproj.filters b/plugins/FavContacts/favcontacts.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/FavContacts/favcontacts.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/FavContacts/favcontacts_10.vcxproj b/plugins/FavContacts/favcontacts_10.vcxproj deleted file mode 100644 index 1e9a259df4..0000000000 --- a/plugins/FavContacts/favcontacts_10.vcxproj +++ /dev/null @@ -1,210 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2D0B4CB0-3ACA-4612-B745-FF3050E1500A} - FavContacts - - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - false - Use - headers.h - - - comctl32.lib;ws2_32.lib;%(AdditionalDependencies) - true - Windows - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Level3 - false - Use - headers.h - - - comctl32.lib;ws2_32.lib;%(AdditionalDependencies) - true - Windows - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Full - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - Level3 - false - Use - headers.h - - - comctl32.lib;ws2_32.lib;%(AdditionalDependencies) - Windows - true - true - false - $(IntDir)$(TargetName).lib - true - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Full - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - Level3 - false - Use - headers.h - - - comctl32.lib;ws2_32.lib;%(AdditionalDependencies) - Windows - true - true - false - $(IntDir)$(TargetName).lib - true - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/FavContacts/favcontacts_10.vcxproj.filters b/plugins/FavContacts/favcontacts_10.vcxproj.filters deleted file mode 100644 index 60d8eb3689..0000000000 --- a/plugins/FavContacts/favcontacts_10.vcxproj.filters +++ /dev/null @@ -1,80 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/FavContacts/favcontacts_12.vcxproj b/plugins/FavContacts/favcontacts_12.vcxproj deleted file mode 100644 index 5e362e62f9..0000000000 --- a/plugins/FavContacts/favcontacts_12.vcxproj +++ /dev/null @@ -1,213 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2D0B4CB0-3ACA-4612-B745-FF3050E1500A} - FavContacts - - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - false - Use - headers.h - - - comctl32.lib;ws2_32.lib;%(AdditionalDependencies) - true - Windows - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Level3 - false - Use - headers.h - - - comctl32.lib;ws2_32.lib;%(AdditionalDependencies) - true - Windows - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Full - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - Level3 - false - Use - headers.h - - - comctl32.lib;ws2_32.lib;%(AdditionalDependencies) - Windows - true - true - false - $(IntDir)$(TargetName).lib - true - $(ProfileDir)..\..\bin12\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Full - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - Level3 - false - Use - headers.h - - - comctl32.lib;ws2_32.lib;%(AdditionalDependencies) - Windows - true - true - false - $(IntDir)$(TargetName).lib - true - $(ProfileDir)..\..\bin12\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/FavContacts/favcontacts_12.vcxproj.filters b/plugins/FavContacts/favcontacts_12.vcxproj.filters deleted file mode 100644 index c6327a32f9..0000000000 --- a/plugins/FavContacts/favcontacts_12.vcxproj.filters +++ /dev/null @@ -1,80 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/FavContacts/src/contact_cache.cpp b/plugins/FavContacts/src/contact_cache.cpp index fc6c2dc45d..896eae5cca 100644 --- a/plugins/FavContacts/src/contact_cache.cpp +++ b/plugins/FavContacts/src/contact_cache.cpp @@ -1,4 +1,4 @@ -#include "headers.h" +#include "stdafx.h" static int CompareItem(const CContactCache::TContactInfo *p1, const CContactCache::TContactInfo *p2) { diff --git a/plugins/FavContacts/src/cserver.cpp b/plugins/FavContacts/src/cserver.cpp index d3a7ff5a0a..18739f8e34 100644 --- a/plugins/FavContacts/src/cserver.cpp +++ b/plugins/FavContacts/src/cserver.cpp @@ -1,4 +1,4 @@ -#include "headers.h" +#include "stdafx.h" #include "csocket.h" #include "cserver.h" diff --git a/plugins/FavContacts/src/csocket.cpp b/plugins/FavContacts/src/csocket.cpp index 8b31467c61..0737d8e734 100644 --- a/plugins/FavContacts/src/csocket.cpp +++ b/plugins/FavContacts/src/csocket.cpp @@ -1,4 +1,4 @@ -#include "headers.h" +#include "stdafx.h" #include "csocket.h" diff --git a/plugins/FavContacts/src/headers.h b/plugins/FavContacts/src/headers.h deleted file mode 100644 index 998412d18b..0000000000 --- a/plugins/FavContacts/src/headers.h +++ /dev/null @@ -1,102 +0,0 @@ -/* -Favorite Contacts for Miranda IM - -Copyright 2007 Victor Pavlychko - -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 _CRT_SECURE_NO_DEPRECATE - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "resource.h" -#include "version.h" -#include "contact_cache.h" - -///////////////////////////////////////////////////////////////////////////////////////// - -#define MS_FAVCONTACTS_SHOWMENU "FavContacts/ShowMenu" -#define MS_FAVCONTACTS_SHOWMENU_CENTERED "FavContacts/ShowMenuCentered" -#define MS_FAVCONTACTS_OPEN_CONTACT "FavContacts/OpenContact" - -struct Options -{ - BYTE bSecondLine; - BYTE bAvatars; - BYTE bAvatarBorder; - WORD wAvatarRadius; - BYTE bNoTransparentBorder; - BYTE bSysColors; - BYTE bCenterHotkey; - BYTE bUseGroups; - BYTE bUseColumns; - BYTE bRightAvatars; - BYTE bDimIdle; - WORD wMaxRecent; - - COLORREF clLine1, clLine2, clBack; - COLORREF clLine1Sel, clLine2Sel, clBackSel; - HFONT hfntName, hfntSecond; -}; - -extern Options g_Options; -extern CContactCache *g_contactCache; - -#include "favlist.h" - -BOOL MenuDrawItem(LPDRAWITEMSTRUCT lpdis, Options *options = NULL); -BOOL MenuMeasureItem(LPMEASUREITEMSTRUCT lpmis, Options *options = NULL); - -int ProcessOptInitialise(WPARAM, LPARAM); -int ProcessModulesLoaded(WPARAM, LPARAM); - -void LoadOptions(); -int ShowMenu(bool centered); - -void InitMenu(); -void UninitMenu(); - -void InitServices(); -void UninitServices(); - -extern HINSTANCE g_hInst; -extern IconItem iconList[]; diff --git a/plugins/FavContacts/src/http_api.cpp b/plugins/FavContacts/src/http_api.cpp index 77f918a1c9..14a65dca5c 100644 --- a/plugins/FavContacts/src/http_api.cpp +++ b/plugins/FavContacts/src/http_api.cpp @@ -1,4 +1,4 @@ -#include "headers.h" +#include "stdafx.h" #include "csocket.h" #include "cserver.h" diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp index 6051d2ad7c..62579e9ba2 100644 --- a/plugins/FavContacts/src/main.cpp +++ b/plugins/FavContacts/src/main.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "headers.h" +#include "stdafx.h" #include "http_api.h" @@ -52,13 +52,13 @@ CContactCache *g_contactCache = NULL; Options g_Options = { 0 }; -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { g_hInst = hinstDLL; return TRUE; } -extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD) { return &pluginInfo; } diff --git a/plugins/FavContacts/src/menu.cpp b/plugins/FavContacts/src/menu.cpp index 56c0c5992d..903590bd88 100644 --- a/plugins/FavContacts/src/menu.cpp +++ b/plugins/FavContacts/src/menu.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "headers.h" +#include "stdafx.h" UINT g_maxItemWidth = 0; float g_widthMultiplier = 0; diff --git a/plugins/FavContacts/src/options.cpp b/plugins/FavContacts/src/options.cpp index 0d6c8f7eac..aa895c4856 100644 --- a/plugins/FavContacts/src/options.cpp +++ b/plugins/FavContacts/src/options.cpp @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "headers.h" +#include "stdafx.h" void LoadOptions() { @@ -257,7 +257,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA return FALSE; } -int ProcessOptInitialise(WPARAM wParam, LPARAM lParam) +int ProcessOptInitialise(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.position = 100000000; diff --git a/plugins/FavContacts/src/services.cpp b/plugins/FavContacts/src/services.cpp index 4ae06077e1..c17e515b2d 100644 --- a/plugins/FavContacts/src/services.cpp +++ b/plugins/FavContacts/src/services.cpp @@ -18,31 +18,31 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "headers.h" +#include "stdafx.h" static MCONTACT hContactToActivate; static HANDLE hDialogsList; -INT_PTR svcShowMenu(WPARAM wParam, LPARAM lParam) +INT_PTR svcShowMenu(WPARAM, LPARAM) { ShowMenu(false); return 0; } -INT_PTR svcShowMenuCentered(WPARAM wParam, LPARAM lParam) +INT_PTR svcShowMenuCentered(WPARAM, LPARAM) { ShowMenu(g_Options.bCenterHotkey ? true : false); return 0; } -INT_PTR svcOpenContact(WPARAM wParam, LPARAM lParam) +INT_PTR svcOpenContact(WPARAM wParam, LPARAM) { hContactToActivate = wParam; CallService(MS_CLIST_CONTACTDOUBLECLICKED, (WPARAM)hContactToActivate, 0); return 0; } -int ProcessSrmmEvent(WPARAM wParam, LPARAM lParam) +int ProcessSrmmEvent(WPARAM, LPARAM lParam) { MessageWindowEventData *event = (MessageWindowEventData *)lParam; @@ -110,7 +110,7 @@ static __forceinline COLORREF sttShadeColor(COLORREF clLine1, COLORREF clBack) (GetBValue(clLine1) * 66UL + GetBValue(clBack) * 34UL) / 100); } -int ProcessTBLoaded(WPARAM wParam, LPARAM lParam) +int ProcessTBLoaded(WPARAM, LPARAM) { TTBButton ttb = { sizeof(ttb) }; ttb.pszTooltipUp = ttb.name = LPGEN("Favorite Contacts"); @@ -121,7 +121,7 @@ int ProcessTBLoaded(WPARAM wParam, LPARAM lParam) return 0; } -int ProcessReloadFonts(WPARAM wParam, LPARAM lParam) +int ProcessReloadFonts(WPARAM, LPARAM) { if (g_Options.hfntName) DeleteObject(g_Options.hfntName); if (g_Options.hfntSecond) DeleteObject(g_Options.hfntSecond); @@ -154,7 +154,7 @@ int ProcessReloadFonts(WPARAM wParam, LPARAM lParam) return 0; } -int ProcessModulesLoaded(WPARAM wParam, LPARAM lParam) +int ProcessModulesLoaded(WPARAM, LPARAM) { HookEvent(ME_TTB_MODULELOADED, ProcessTBLoaded); diff --git a/plugins/FavContacts/src/stdafx.cpp b/plugins/FavContacts/src/stdafx.cpp deleted file mode 100644 index 7e0216078c..0000000000 --- a/plugins/FavContacts/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (C) 2012-15 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 -as published by the Free Software Foundation version 2 -of the License. - -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, see . -*/ - -#include "headers.h" \ No newline at end of file diff --git a/plugins/FavContacts/src/stdafx.cxx b/plugins/FavContacts/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/FavContacts/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-15 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 +as published by the Free Software Foundation version 2 +of the License. + +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, see . +*/ + +#include "stdafx.h" \ No newline at end of file diff --git a/plugins/FavContacts/src/stdafx.h b/plugins/FavContacts/src/stdafx.h new file mode 100644 index 0000000000..998412d18b --- /dev/null +++ b/plugins/FavContacts/src/stdafx.h @@ -0,0 +1,102 @@ +/* +Favorite Contacts for Miranda IM + +Copyright 2007 Victor Pavlychko + +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 _CRT_SECURE_NO_DEPRECATE + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "resource.h" +#include "version.h" +#include "contact_cache.h" + +///////////////////////////////////////////////////////////////////////////////////////// + +#define MS_FAVCONTACTS_SHOWMENU "FavContacts/ShowMenu" +#define MS_FAVCONTACTS_SHOWMENU_CENTERED "FavContacts/ShowMenuCentered" +#define MS_FAVCONTACTS_OPEN_CONTACT "FavContacts/OpenContact" + +struct Options +{ + BYTE bSecondLine; + BYTE bAvatars; + BYTE bAvatarBorder; + WORD wAvatarRadius; + BYTE bNoTransparentBorder; + BYTE bSysColors; + BYTE bCenterHotkey; + BYTE bUseGroups; + BYTE bUseColumns; + BYTE bRightAvatars; + BYTE bDimIdle; + WORD wMaxRecent; + + COLORREF clLine1, clLine2, clBack; + COLORREF clLine1Sel, clLine2Sel, clBackSel; + HFONT hfntName, hfntSecond; +}; + +extern Options g_Options; +extern CContactCache *g_contactCache; + +#include "favlist.h" + +BOOL MenuDrawItem(LPDRAWITEMSTRUCT lpdis, Options *options = NULL); +BOOL MenuMeasureItem(LPMEASUREITEMSTRUCT lpmis, Options *options = NULL); + +int ProcessOptInitialise(WPARAM, LPARAM); +int ProcessModulesLoaded(WPARAM, LPARAM); + +void LoadOptions(); +int ShowMenu(bool centered); + +void InitMenu(); +void UninitMenu(); + +void InitServices(); +void UninitServices(); + +extern HINSTANCE g_hInst; +extern IconItem iconList[]; -- cgit v1.2.3