From 153360d2601bded9d77df304a2a2b4c83a5a4998 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 25 Jul 2015 15:07:49 +0000 Subject: MirandaG15: common project git-svn-id: http://svn.miranda-ng.org/main/trunk@14691 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 +- bin14/mir_dev.sln | 2 +- bin14/mir_full.sln | 2 +- build/vc.common/common.props | 2 +- plugins/MirandaG15/MirandaG15.vcxproj | 39 +++ plugins/MirandaG15/MirandaG15.vcxproj.filters | 4 + plugins/MirandaG15/MirandaG15_10.vcxproj | 307 -------------------- plugins/MirandaG15/MirandaG15_10.vcxproj.filters | 346 ----------------------- plugins/MirandaG15/MirandaG15_12.vcxproj | 315 --------------------- plugins/MirandaG15/MirandaG15_12.vcxproj.filters | 346 ----------------------- plugins/MirandaG15/MirandaG15_14.vcxproj | 315 --------------------- plugins/MirandaG15/MirandaG15_14.vcxproj.filters | 346 ----------------------- plugins/MirandaG15/src/CAppletManager.h | 4 +- plugins/MirandaG15/src/CChatScreen.h | 6 +- plugins/MirandaG15/src/CContactList.h | 2 +- plugins/MirandaG15/src/CContactlistScreen.h | 2 +- plugins/MirandaG15/src/CCreditsScreen.h | 2 +- plugins/MirandaG15/src/CEventLog.h | 2 +- plugins/MirandaG15/src/CEventScreen.h | 2 +- plugins/MirandaG15/src/CNotificationScreen.h | 8 +- plugins/MirandaG15/src/CScreen.h | 4 +- plugins/MirandaG15/src/CScreensaverScreen.h | 2 +- plugins/MirandaG15/src/StdAfx.h | 2 +- plugins/MirandaG15/src/stdafx.cpp | 18 -- plugins/MirandaG15/src/stdafx.cxx | 18 ++ plugins/NewsAggregator/Src/CheckFeed.cpp | 135 +++++++-- plugins/NewsAggregator/Src/Options.cpp | 11 +- 31 files changed, 209 insertions(+), 2043 deletions(-) create mode 100644 plugins/MirandaG15/MirandaG15.vcxproj create mode 100644 plugins/MirandaG15/MirandaG15.vcxproj.filters delete mode 100644 plugins/MirandaG15/MirandaG15_10.vcxproj delete mode 100644 plugins/MirandaG15/MirandaG15_10.vcxproj.filters delete mode 100644 plugins/MirandaG15/MirandaG15_12.vcxproj delete mode 100644 plugins/MirandaG15/MirandaG15_12.vcxproj.filters delete mode 100644 plugins/MirandaG15/MirandaG15_14.vcxproj delete mode 100644 plugins/MirandaG15/MirandaG15_14.vcxproj.filters delete mode 100644 plugins/MirandaG15/src/stdafx.cpp create mode 100644 plugins/MirandaG15/src/stdafx.cxx diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln index 7f4a4b4d60..42a1810ce4 100644 --- a/bin10/mir_dev.sln +++ b/bin10/mir_dev.sln @@ -385,7 +385,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VKontakte", "..\protocols\V EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupSilence", "..\plugins\StartupSilence\StartupSilence_10.vcxproj", "{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15_10.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\libs\libcurl\libcurl.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" EndProject diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index e7cea3f7f1..5d52c92818 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -392,7 +392,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VKontakte", "..\protocols\V EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupSilence", "..\plugins\StartupSilence\StartupSilence_10.vcxproj", "{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15_10.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemovePersonalSettings", "..\plugins\RemovePersonalSettings\rps_10.vcxproj", "{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}" EndProject diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index fa607cb55c..081969d7cc 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -426,7 +426,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VKontakte", "..\protocols\V EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupSilence", "..\plugins\StartupSilence\StartupSilence_10.vcxproj", "{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15_10.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemovePersonalSettings", "..\plugins\RemovePersonalSettings\rps_10.vcxproj", "{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}" EndProject diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln index f980154352..84d4077c8f 100644 --- a/bin12/mir_dev.sln +++ b/bin12/mir_dev.sln @@ -392,7 +392,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VKontakte", "..\protocols\V EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupSilence", "..\plugins\StartupSilence\StartupSilence_12.vcxproj", "{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15_12.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\libs\libcurl\libcurl.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" EndProject diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln index 84d5b026ff..c7c79dff12 100644 --- a/bin12/mir_full.sln +++ b/bin12/mir_full.sln @@ -394,7 +394,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VKontakte", "..\protocols\V EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupSilence", "..\plugins\StartupSilence\StartupSilence_12.vcxproj", "{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15_12.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemovePersonalSettings", "..\plugins\RemovePersonalSettings\rps_12.vcxproj", "{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}" EndProject diff --git a/bin14/mir_dev.sln b/bin14/mir_dev.sln index 938b03a94b..ea1f3a384f 100644 --- a/bin14/mir_dev.sln +++ b/bin14/mir_dev.sln @@ -396,7 +396,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VKontakte", "..\protocols\V EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupSilence", "..\plugins\StartupSilence\StartupSilence_14.vcxproj", "{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15_14.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\libs\libcurl\libcurl.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" EndProject diff --git a/bin14/mir_full.sln b/bin14/mir_full.sln index f15cba980d..7ea787ab3c 100644 --- a/bin14/mir_full.sln +++ b/bin14/mir_full.sln @@ -394,7 +394,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VKontakte", "..\protocols\V EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupSilence", "..\plugins\StartupSilence\StartupSilence_14.vcxproj", "{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15_14.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemovePersonalSettings", "..\plugins\RemovePersonalSettings\rps_14.vcxproj", "{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}" EndProject diff --git a/build/vc.common/common.props b/build/vc.common/common.props index 9fa6933ed6..9592ae6fa9 100644 --- a/build/vc.common/common.props +++ b/build/vc.common/common.props @@ -34,7 +34,7 @@ false - msimg32.lib;comctl32.lib;ws2_32.lib;UxTheme.lib;Iphlpapi.lib;%(AdditionalDependencies) + Setupapi.lib;msimg32.lib;comctl32.lib;ws2_32.lib;UxTheme.lib;Iphlpapi.lib;%(AdditionalDependencies) $(CommonLibDir) true false diff --git a/plugins/MirandaG15/MirandaG15.vcxproj b/plugins/MirandaG15/MirandaG15.vcxproj new file mode 100644 index 0000000000..91a0db1fb6 --- /dev/null +++ b/plugins/MirandaG15/MirandaG15.vcxproj @@ -0,0 +1,39 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8ACA3C8B-BDFA-47B2-8578-069555BA05B3} + MirandaG15 + + + + + + + false + + + + + + + + + \ No newline at end of file diff --git a/plugins/MirandaG15/MirandaG15.vcxproj.filters b/plugins/MirandaG15/MirandaG15.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/MirandaG15/MirandaG15.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/MirandaG15/MirandaG15_10.vcxproj b/plugins/MirandaG15/MirandaG15_10.vcxproj deleted file mode 100644 index e8bc67a770..0000000000 --- a/plugins/MirandaG15/MirandaG15_10.vcxproj +++ /dev/null @@ -1,307 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {8ACA3C8B-BDFA-47B2-8578-069555BA05B3} - MirandaG15 - Win32Proj - MirandaG15 - - - - 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)\ - true - true - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - false - false - - - - Disabled - src\LCDFramework;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - - - comctl32.lib %(AdditionalOptions) - true - Windows - false - - - MachineX86 - $(ProfileDir)..\..\bin10\lib - $(IntDir)$(TargetName).lib - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies) - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Disabled - src\LCDFramework;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - - - comctl32.lib %(AdditionalOptions) - true - Windows - false - - - $(ProfileDir)..\..\bin10\lib - $(IntDir)$(TargetName).lib - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies) - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - src\LCDFramework;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - Use - Level3 - ProgramDatabase - Full - Size - OnlyExplicitInline - true - - - comctl32.lib /PDBALTPATH:%_PDB% %(AdditionalOptions) - true - Windows - true - true - false - - - MachineX86 - $(ProfileDir)..\..\bin10\lib - $(IntDir)$(TargetName).lib - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies) - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - src\LCDFramework;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - Use - Level3 - ProgramDatabase - Full - Size - OnlyExplicitInline - true - - - comctl32.lib /PDBALTPATH:%_PDB% %(AdditionalOptions) - true - Windows - true - true - false - - - $(ProfileDir)..\..\bin10\lib - $(IntDir)$(TargetName).lib - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies) - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/MirandaG15/MirandaG15_10.vcxproj.filters b/plugins/MirandaG15/MirandaG15_10.vcxproj.filters deleted file mode 100644 index 72a5dfc1b3..0000000000 --- a/plugins/MirandaG15/MirandaG15_10.vcxproj.filters +++ /dev/null @@ -1,346 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {da23f7ae-a558-4f9c-a10b-acaf09ad33b9} - - - {646e30dc-4ba4-489e-8aa3-b99f397e0963} - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {68ea4916-17a8-4272-b715-f6810cc42684} - - - {15a59424-ddac-499b-b802-aca213f69f7b} - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {00d79f18-bb9f-4b49-a3ac-0e053d0c958d} - - - {e90eb6ae-328d-4e9f-9b67-7c3237f9789b} - - - {5ad0b934-b803-4d5c-ba62-d42784de04ef} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Objects - - - Source Files\Objects - - - Source Files - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Objects - - - Header Files\Objects - - - Header Files - - - Header Files - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/MirandaG15/MirandaG15_12.vcxproj b/plugins/MirandaG15/MirandaG15_12.vcxproj deleted file mode 100644 index dd0e73a7d4..0000000000 --- a/plugins/MirandaG15/MirandaG15_12.vcxproj +++ /dev/null @@ -1,315 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {8ACA3C8B-BDFA-47B2-8578-069555BA05B3} - MirandaG15 - Win32Proj - MirandaG15 - - - - 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)\ - true - true - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - false - false - - - - Disabled - src\LCDFramework;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - - - comctl32.lib %(AdditionalOptions) - true - Windows - false - - - MachineX86 - $(ProfileDir)..\..\bin12\lib - $(IntDir)$(TargetName).lib - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies) - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Disabled - src\LCDFramework;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - - - comctl32.lib %(AdditionalOptions) - true - Windows - false - - - $(ProfileDir)..\..\bin12\lib - $(IntDir)$(TargetName).lib - false - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies) - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - src\LCDFramework;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - Use - Level3 - ProgramDatabase - Full - Size - OnlyExplicitInline - true - - - comctl32.lib %(AdditionalOptions) - true - Windows - true - true - false - - - MachineX86 - $(ProfileDir)..\..\bin12\lib - $(IntDir)$(TargetName).lib - false - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies) - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - src\LCDFramework;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - Use - Level3 - ProgramDatabase - Full - Size - OnlyExplicitInline - true - - - comctl32.lib %(AdditionalOptions) - true - Windows - true - true - false - - - $(ProfileDir)..\..\bin12\lib - $(IntDir)$(TargetName).lib - false - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies) - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/MirandaG15/MirandaG15_12.vcxproj.filters b/plugins/MirandaG15/MirandaG15_12.vcxproj.filters deleted file mode 100644 index 8b4e42bf94..0000000000 --- a/plugins/MirandaG15/MirandaG15_12.vcxproj.filters +++ /dev/null @@ -1,346 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {da23f7ae-a558-4f9c-a10b-acaf09ad33b9} - - - {646e30dc-4ba4-489e-8aa3-b99f397e0963} - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {68ea4916-17a8-4272-b715-f6810cc42684} - - - {15a59424-ddac-499b-b802-aca213f69f7b} - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {00d79f18-bb9f-4b49-a3ac-0e053d0c958d} - - - {e90eb6ae-328d-4e9f-9b67-7c3237f9789b} - - - {483cf247-e446-4087-a913-a455c5bfe3b5} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Objects - - - Source Files\Objects - - - Source Files - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Objects - - - Header Files\Objects - - - Header Files - - - Header Files - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/MirandaG15/MirandaG15_14.vcxproj b/plugins/MirandaG15/MirandaG15_14.vcxproj deleted file mode 100644 index f5bd363f86..0000000000 --- a/plugins/MirandaG15/MirandaG15_14.vcxproj +++ /dev/null @@ -1,315 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {8ACA3C8B-BDFA-47B2-8578-069555BA05B3} - MirandaG15 - Win32Proj - MirandaG15 - - - - DynamicLibrary - Unicode - true - v140_xp - - - DynamicLibrary - Unicode - true - v140_xp - - - DynamicLibrary - Unicode - v140_xp - - - DynamicLibrary - Unicode - v140_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - true - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - false - false - - - - Disabled - src\LCDFramework;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - - - comctl32.lib %(AdditionalOptions) - true - Windows - false - - - MachineX86 - $(ProfileDir)..\..\bin14\lib - $(IntDir)$(TargetName).lib - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies) - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Disabled - src\LCDFramework;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - - - comctl32.lib %(AdditionalOptions) - true - Windows - false - - - $(ProfileDir)..\..\bin14\lib - $(IntDir)$(TargetName).lib - false - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies) - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - src\LCDFramework;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - Use - Level3 - ProgramDatabase - Full - Size - OnlyExplicitInline - true - - - comctl32.lib %(AdditionalOptions) - true - Windows - true - true - false - - - MachineX86 - $(ProfileDir)..\..\bin14\lib - $(IntDir)$(TargetName).lib - false - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies) - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - src\LCDFramework;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - Use - Level3 - ProgramDatabase - Full - Size - OnlyExplicitInline - true - - - comctl32.lib %(AdditionalOptions) - true - Windows - true - true - false - - - $(ProfileDir)..\..\bin14\lib - $(IntDir)$(TargetName).lib - false - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;%(AdditionalDependencies) - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/MirandaG15/MirandaG15_14.vcxproj.filters b/plugins/MirandaG15/MirandaG15_14.vcxproj.filters deleted file mode 100644 index 8b4e42bf94..0000000000 --- a/plugins/MirandaG15/MirandaG15_14.vcxproj.filters +++ /dev/null @@ -1,346 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {da23f7ae-a558-4f9c-a10b-acaf09ad33b9} - - - {646e30dc-4ba4-489e-8aa3-b99f397e0963} - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {68ea4916-17a8-4272-b715-f6810cc42684} - - - {15a59424-ddac-499b-b802-aca213f69f7b} - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {00d79f18-bb9f-4b49-a3ac-0e053d0c958d} - - - {e90eb6ae-328d-4e9f-9b67-7c3237f9789b} - - - {483cf247-e446-4087-a913-a455c5bfe3b5} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Screens - - - Source Files\Objects - - - Source Files\Objects - - - Source Files - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - Source Files\LCDframework - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Screens - - - Header Files\Objects - - - Header Files\Objects - - - Header Files - - - Header Files - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - Header Files\LCDframework - - - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/MirandaG15/src/CAppletManager.h b/plugins/MirandaG15/src/CAppletManager.h index 2e70f906ba..c0836a9ff6 100644 --- a/plugins/MirandaG15/src/CAppletManager.h +++ b/plugins/MirandaG15/src/CAppletManager.h @@ -1,7 +1,7 @@ #ifndef _COUTPUTMANAGER_H_ #define _COUTPUTMANAGER_H_ -#include "CLCDOutputManager.h" +#include "LCDFramework\CLCDOutputManager.h" #include "CProtocolData.h" #include "CIRCHistory.h" @@ -14,7 +14,7 @@ #include "CCreditsScreen.h" #include "CScreensaverScreen.h" -#include "CLCDConnectionLogitech.h" +#include "LCDFramework\CLCDConnectionLogitech.h" struct SMessageJob { diff --git a/plugins/MirandaG15/src/CChatScreen.h b/plugins/MirandaG15/src/CChatScreen.h index 4f1582083b..f9f818d16c 100644 --- a/plugins/MirandaG15/src/CChatScreen.h +++ b/plugins/MirandaG15/src/CChatScreen.h @@ -3,9 +3,9 @@ #include "CScreen.h" -#include "CLCDLabel.h" -#include "CLCDTextLog.h" -#include "CLCDInput.h" +#include "LCDFramework\CLCDLabel.h" +#include "LCDFramework\CLCDTextLog.h" +#include "LCDFramework\CLCDInput.h" class CChatScreen : public CScreen { diff --git a/plugins/MirandaG15/src/CContactList.h b/plugins/MirandaG15/src/CContactList.h index 52d68be1df..1c0679c59b 100644 --- a/plugins/MirandaG15/src/CContactList.h +++ b/plugins/MirandaG15/src/CContactList.h @@ -1,7 +1,7 @@ #ifndef _CCONTACTLIST_H_ #define _CCONTACTLIST_H_ -#include "CLCDList.h" +#include "LCDFramework\CLCDList.h" class CContactListEntry { diff --git a/plugins/MirandaG15/src/CContactlistScreen.h b/plugins/MirandaG15/src/CContactlistScreen.h index b0f06e265e..f181dae01c 100644 --- a/plugins/MirandaG15/src/CContactlistScreen.h +++ b/plugins/MirandaG15/src/CContactlistScreen.h @@ -3,7 +3,7 @@ #include "CScreen.h" #include "CContactList.h" -#include "CLCDBar.h" +#include "LCDFramework\CLCDBar.h" class CContactlistScreen : public CScreen { diff --git a/plugins/MirandaG15/src/CCreditsScreen.h b/plugins/MirandaG15/src/CCreditsScreen.h index 3873fc2c79..115471f74a 100644 --- a/plugins/MirandaG15/src/CCreditsScreen.h +++ b/plugins/MirandaG15/src/CCreditsScreen.h @@ -2,7 +2,7 @@ #define _CCREDITSSCREEN_H_ #include "CScreen.h" -#include "CLCDLabel.h" +#include "LCDFramework\CLCDLabel.h" class CCreditsScreen : public CScreen { diff --git a/plugins/MirandaG15/src/CEventLog.h b/plugins/MirandaG15/src/CEventLog.h index 6f9efe8996..883ca4473f 100644 --- a/plugins/MirandaG15/src/CEventLog.h +++ b/plugins/MirandaG15/src/CEventLog.h @@ -1,7 +1,7 @@ #ifndef _CEVENTLOG_H_ #define _CEVENTLOG_H_ -#include "CLCDList.h" +#include "LCDFramework\CLCDList.h" class CEventLogEntry { diff --git a/plugins/MirandaG15/src/CEventScreen.h b/plugins/MirandaG15/src/CEventScreen.h index e2eeccc24c..7ef9135744 100644 --- a/plugins/MirandaG15/src/CEventScreen.h +++ b/plugins/MirandaG15/src/CEventScreen.h @@ -3,7 +3,7 @@ #include "CScreen.h" #include "CEventLog.h" -#include "CLCDBar.h" +#include "LCDFramework\CLCDBar.h" class CEventScreen : public CScreen { diff --git a/plugins/MirandaG15/src/CNotificationScreen.h b/plugins/MirandaG15/src/CNotificationScreen.h index 98130c8de5..957cdb80dc 100644 --- a/plugins/MirandaG15/src/CNotificationScreen.h +++ b/plugins/MirandaG15/src/CNotificationScreen.h @@ -2,10 +2,10 @@ #define _CNOTIFICATIONSCREEN_H_ #include "CScreen.h" -#include "CLCDLabel.h" -#include "CLCDTextLog.h" -#include "CLCDBar.h" -#include "CLCDInput.h" +#include "LCDFramework\CLCDLabel.h" +#include "LCDFramework\CLCDTextLog.h" +#include "LCDFramework\CLCDBar.h" +#include "LCDFramework\CLCDInput.h" class CNotificationEntry { diff --git a/plugins/MirandaG15/src/CScreen.h b/plugins/MirandaG15/src/CScreen.h index 53b05a96e3..7c3939861c 100644 --- a/plugins/MirandaG15/src/CScreen.h +++ b/plugins/MirandaG15/src/CScreen.h @@ -1,8 +1,8 @@ #ifndef _CSCREEN_H_ #define _CSCREEN_H_ -#include "CLCDScreen.h" -#include "CLCDBitmap.h" +#include "LCDFramework\CLCDScreen.h" +#include "LCDFramework\CLCDBitmap.h" //#include "CLCDLabel.h" class CScreen : public CLCDScreen diff --git a/plugins/MirandaG15/src/CScreensaverScreen.h b/plugins/MirandaG15/src/CScreensaverScreen.h index 19592a204b..515e80e290 100644 --- a/plugins/MirandaG15/src/CScreensaverScreen.h +++ b/plugins/MirandaG15/src/CScreensaverScreen.h @@ -2,7 +2,7 @@ #define _CSCREENSAVERSSCREEN_H_ #include "CScreen.h" -#include "CLCDLabel.h" +#include "LCDFramework\CLCDLabel.h" class CScreensaverScreen : public CScreen { diff --git a/plugins/MirandaG15/src/StdAfx.h b/plugins/MirandaG15/src/StdAfx.h index f92f33606d..e6df528c12 100644 --- a/plugins/MirandaG15/src/StdAfx.h +++ b/plugins/MirandaG15/src/StdAfx.h @@ -40,7 +40,7 @@ using namespace std; #define ASSERT assert -#include "LCDFramework.h" +#include "LCDFramework\LCDFramework.h" #include "Miranda.h" #include "CEvent.h" diff --git a/plugins/MirandaG15/src/stdafx.cpp b/plugins/MirandaG15/src/stdafx.cpp deleted file mode 100644 index 7e437924f6..0000000000 --- a/plugins/MirandaG15/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 "StdAfx.h" \ No newline at end of file diff --git a/plugins/MirandaG15/src/stdafx.cxx b/plugins/MirandaG15/src/stdafx.cxx new file mode 100644 index 0000000000..7e437924f6 --- /dev/null +++ b/plugins/MirandaG15/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/NewsAggregator/Src/CheckFeed.cpp b/plugins/NewsAggregator/Src/CheckFeed.cpp index 3ea2a0f3d9..6b19b6eb23 100644 --- a/plugins/NewsAggregator/Src/CheckFeed.cpp +++ b/plugins/NewsAggregator/Src/CheckFeed.cpp @@ -33,10 +33,19 @@ LPCTSTR CheckFeed(TCHAR *tszURL, HWND hwndDlg) mir_free(tszData); mir_free(szData); if (hXml != NULL) { + LPCTSTR codepage = NULL; int childcount = 0; HXML node; - if (!mir_tstrcmpi(xmlGetName(hXml), _T("xml"))) + if (!mir_tstrcmpi(xmlGetName(hXml), _T("xml"))) { + for (int i = 0; xmlGetAttrCount(hXml); i++) { + LPCTSTR szAttrName = xmlGetAttrName(hXml, i); + if (!mir_tstrcmpi(szAttrName, _T("encoding"))) { + codepage = xmlGetAttrValue(hXml, szAttrName); + break; + } + } node = xmlGetChild(hXml, childcount); + } else node = hXml; while (node) { @@ -49,7 +58,13 @@ LPCTSTR CheckFeed(TCHAR *tszURL, HWND hwndDlg) TCHAR mes[MAX_PATH]; mir_sntprintf(mes, _countof(mes), TranslateT("%s\nis a valid feed's address."), tszURL); MessageBox(hwndDlg, mes, TranslateT("News Aggregator"), MB_OK | MB_ICONINFORMATION); - return xmlGetText(child); + if (!mir_tstrcmpi(codepage, _T("koi8-r"))) { + TCHAR buf[MAX_PATH]; + MultiByteToWideChar(20866, 0, _T2A(xmlGetText(child)), -1, buf, _countof(buf)); + return mir_tstrdup(buf); + } + else + return mir_tstrdup(xmlGetText(child)); } } } @@ -60,7 +75,13 @@ LPCTSTR CheckFeed(TCHAR *tszURL, HWND hwndDlg) TCHAR mes[MAX_PATH]; mir_sntprintf(mes, _countof(mes), TranslateT("%s\nis a valid feed's address."), tszURL); MessageBox(hwndDlg, mes, TranslateT("News Aggregator"), MB_OK | MB_ICONINFORMATION); - return xmlGetText(child); + if (!mir_tstrcmpi(codepage, _T("koi8-r"))) { + TCHAR buf[MAX_PATH]; + MultiByteToWideChar(20866, 0, _T2A(xmlGetText(child)), -1, buf, _countof(buf)); + return buf; + } + else + return xmlGetText(child); } } } @@ -182,10 +203,19 @@ void CheckCurrentFeed(MCONTACT hContact) CMString szValue; if (hXml != NULL) { + LPCTSTR codepage = NULL; int childcount = 0; HXML node; - if (!mir_tstrcmpi(xmlGetName(hXml), _T("xml"))) + if (!mir_tstrcmpi(xmlGetName(hXml), _T("xml"))) { + for (int i = 0; xmlGetAttrCount(hXml); i++) { + LPCTSTR szAttrName = xmlGetAttrName(hXml, i); + if (!mir_tstrcmpi(szAttrName, _T("encoding"))) { + codepage = xmlGetAttrValue(hXml, szAttrName); + break; + } + } node = xmlGetChild(hXml, childcount); + } else node = hXml; while (node) { @@ -211,17 +241,38 @@ void CheckCurrentFeed(MCONTACT hContact) HXML child = xmlGetChild(chan, j); LPCTSTR childName = xmlGetName(child); if (!mir_tstrcmpi(childName, _T("title"))) { - LPCTSTR szChildText = xmlGetText(child); + LPCTSTR szChildText = NULL; + if (!mir_tstrcmpi(codepage, _T("koi8-r"))) { + TCHAR buf[MAX_PATH]; + MultiByteToWideChar(20866, 0, _T2A(xmlGetText(child)), -1, buf, _countof(buf)); + szChildText = buf; + } + else + szChildText = xmlGetText(child); if (szChildText) db_set_ts(hContact, MODULE, "FirstName", ClearText(szValue, szChildText)); } else if (!mir_tstrcmpi(childName, _T("link"))) { - LPCTSTR szChildText = xmlGetText(child); + LPCTSTR szChildText = NULL; + if (!mir_tstrcmpi(codepage, _T("koi8-r"))) { + TCHAR buf[MAX_PATH]; + MultiByteToWideChar(20866, 0, _T2A(xmlGetText(child)), -1, buf, _countof(buf)); + szChildText = buf; + } + else + szChildText = xmlGetText(child); if (szChildText) db_set_ts(hContact, MODULE, "Homepage", ClearText(szValue, szChildText)); } else if (!mir_tstrcmpi(childName, _T("description"))) { - LPCTSTR szChildText = xmlGetText(child); + LPCTSTR szChildText = NULL; + if (!mir_tstrcmpi(codepage, _T("koi8-r"))) { + TCHAR buf[MAX_PATH]; + MultiByteToWideChar(20866, 0, _T2A(xmlGetText(child)), -1, buf, _countof(buf)); + szChildText = buf; + } + else + szChildText = xmlGetText(child); if (szChildText) { ClearText(szValue, szChildText); db_set_ts(hContact, MODULE, "About", szValue); @@ -229,22 +280,50 @@ void CheckCurrentFeed(MCONTACT hContact) } } else if (!mir_tstrcmpi(childName, _T("language"))) { - LPCTSTR szChildText = xmlGetText(child); + LPCTSTR szChildText = NULL; + if (!mir_tstrcmpi(codepage, _T("koi8-r"))) { + TCHAR buf[MAX_PATH]; + MultiByteToWideChar(20866, 0, _T2A(xmlGetText(child)), -1, buf, _countof(buf)); + szChildText = buf; + } + else + szChildText = xmlGetText(child); if (szChildText) db_set_ts(hContact, MODULE, "Language1", ClearText(szValue, szChildText)); } else if (!mir_tstrcmpi(childName, _T("managingEditor"))) { - LPCTSTR szChildText = xmlGetText(child); + LPCTSTR szChildText = NULL; + if (!mir_tstrcmpi(codepage, _T("koi8-r"))) { + TCHAR buf[MAX_PATH]; + MultiByteToWideChar(20866, 0, _T2A(xmlGetText(child)), -1, buf, _countof(buf)); + szChildText = buf; + } + else + szChildText = xmlGetText(child); if (szChildText) db_set_ts(hContact, MODULE, "e-mail", ClearText(szValue, szChildText)); } else if (!mir_tstrcmpi(childName, _T("category"))) { - LPCTSTR szChildText = xmlGetText(child); + LPCTSTR szChildText = NULL; + if (!mir_tstrcmpi(codepage, _T("koi8-r"))) { + TCHAR buf[MAX_PATH]; + MultiByteToWideChar(20866, 0, _T2A(xmlGetText(child)), -1, buf, _countof(buf)); + szChildText = buf; + } + else + szChildText = xmlGetText(child); if (szChildText) db_set_ts(hContact, MODULE, "Interest0Text", ClearText(szValue, szChildText)); } else if (!mir_tstrcmpi(childName, _T("copyright"))) { - LPCTSTR szChildText = xmlGetText(child); + LPCTSTR szChildText = NULL; + if (!mir_tstrcmpi(codepage, _T("koi8-r"))) { + TCHAR buf[MAX_PATH]; + MultiByteToWideChar(20866, 0, _T2A(xmlGetText(child)), -1, buf, _countof(buf)); + szChildText = buf; + } + else + szChildText = xmlGetText(child); if (szChildText) db_set_s(hContact, "UserInfo", "MyNotes", _T2A(ClearText(szValue, szChildText))); } @@ -279,7 +358,14 @@ void CheckCurrentFeed(MCONTACT hContact) } } else if (!mir_tstrcmpi(childName, _T("lastBuildDate"))) { - LPCTSTR szChildText = xmlGetText(child); + LPCTSTR szChildText = NULL; + if (!mir_tstrcmpi(codepage, _T("koi8-r"))) { + TCHAR buf[MAX_PATH]; + MultiByteToWideChar(20866, 0, _T2A(xmlGetText(child)), -1, buf, _countof(buf)); + szChildText = buf; + } + else + szChildText = xmlGetText(child); if (szChildText) { TCHAR *lastupdtime = (TCHAR *)xmlGetText(child); time_t stamp = DateToUnixTime(lastupdtime, 0); @@ -298,31 +384,40 @@ void CheckCurrentFeed(MCONTACT hContact) for (int z = 0; z < xmlGetChildCount(child); z++) { HXML itemval = xmlGetChild(child, z); LPCTSTR itemName = xmlGetName(itemval); + LPCTSTR value = NULL; + if (!mir_tstrcmpi(codepage, _T("koi8-r"))) { + TCHAR buf[MAX_PATH]; + MultiByteToWideChar(20866, 0, _T2A(xmlGetText(itemval)), -1, buf, _countof(buf)); + value = buf; + } + else + value = xmlGetText(itemval); + // We only use the first tag for now and ignore the rest. if (!mir_tstrcmpi(itemName, _T("title"))) - ClearText(title, xmlGetText(itemval)); + ClearText(title, value); else if (!mir_tstrcmpi(itemName, _T("link"))) - ClearText(link, xmlGetText(itemval)); + ClearText(link, value); else if (!mir_tstrcmpi(itemName, _T("pubDate")) || !mir_tstrcmpi(itemName, _T("date"))) { if (stamp == 0) - stamp = DateToUnixTime(xmlGetText(itemval), 0); + stamp = DateToUnixTime(value, 0); } else if (!mir_tstrcmpi(itemName, _T("description")) || !mir_tstrcmpi(itemName, _T("encoded"))) - ClearText(descr, xmlGetText(itemval)); + ClearText(descr, value); else if (!mir_tstrcmpi(itemName, _T("author")) || !mir_tstrcmpi(itemName, _T("creator"))) - ClearText(author, xmlGetText(itemval)); + ClearText(author, value); else if (!mir_tstrcmpi(itemName, _T("comments"))) - ClearText(comments, xmlGetText(itemval)); + ClearText(comments, value); else if (!mir_tstrcmpi(itemName, _T("guid"))) - ClearText(guid, xmlGetText(itemval)); + ClearText(guid, value); else if (!mir_tstrcmpi(itemName, _T("category"))) - ClearText(category, xmlGetText(itemval)); + ClearText(category, value); } XmlToMsg(hContact, title, link, descr, author, comments, guid, category, stamp); diff --git a/plugins/NewsAggregator/Src/Options.cpp b/plugins/NewsAggregator/Src/Options.cpp index 7dac335b90..4c2bcd6995 100644 --- a/plugins/NewsAggregator/Src/Options.cpp +++ b/plugins/NewsAggregator/Src/Options.cpp @@ -115,12 +115,13 @@ INT_PTR CALLBACK DlgProcAddFeedOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA EnableWindow(GetDlgItem(hwndDlg, IDC_DISCOVERY), FALSE); SetDlgItemText(hwndDlg, IDC_DISCOVERY, TranslateT("Wait...")); TCHAR tszURL[MAX_PATH] = { 0 }; - const TCHAR *tszTitle = NULL; + TCHAR *tszTitle = NULL; if (GetDlgItemText(hwndDlg, IDC_FEEDURL, tszURL, _countof(tszURL)) || mir_tstrcmp(tszURL, _T("http://")) != 0) - tszTitle = CheckFeed(tszURL, hwndDlg); + tszTitle = (TCHAR*)CheckFeed(tszURL, hwndDlg); else MessageBox(hwndDlg, TranslateT("Enter Feed URL"), TranslateT("Error"), MB_OK); SetDlgItemText(hwndDlg, IDC_FEEDTITLE, tszTitle); + mir_free(tszTitle); EnableWindow(GetDlgItem(hwndDlg, IDC_DISCOVERY), TRUE); SetDlgItemText(hwndDlg, IDC_DISCOVERY, TranslateT("Check Feed")); } @@ -282,8 +283,9 @@ INT_PTR CALLBACK DlgProcChangeFeedOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP if (GetDlgItemText(hwndDlg, IDC_FEEDURL, tszURL, _countof(tszURL)) || mir_tstrcmp(tszURL, _T("http://")) != 0) { EnableWindow(GetDlgItem(hwndDlg, IDC_DISCOVERY), FALSE); SetDlgItemText(hwndDlg, IDC_DISCOVERY, TranslateT("Wait...")); - const TCHAR *tszTitle = CheckFeed(tszURL, hwndDlg); + TCHAR *tszTitle = (TCHAR*)CheckFeed(tszURL, hwndDlg); SetDlgItemText(hwndDlg, IDC_FEEDTITLE, tszTitle); + mir_free(tszTitle); EnableWindow(GetDlgItem(hwndDlg, IDC_DISCOVERY), TRUE); SetDlgItemText(hwndDlg, IDC_DISCOVERY, TranslateT("Check Feed")); } @@ -437,8 +439,9 @@ INT_PTR CALLBACK DlgProcChangeFeedMenu(HWND hwndDlg, UINT msg, WPARAM wParam, LP if (GetDlgItemText(hwndDlg, IDC_FEEDURL, tszURL, _countof(tszURL)) || mir_tstrcmp(tszURL, _T("http://")) != 0) { EnableWindow(GetDlgItem(hwndDlg, IDC_DISCOVERY), FALSE); SetDlgItemText(hwndDlg, IDC_DISCOVERY, TranslateT("Wait...")); - const TCHAR *tszTitle = CheckFeed(tszURL, hwndDlg); + TCHAR *tszTitle = (TCHAR*)CheckFeed(tszURL, hwndDlg); SetDlgItemText(hwndDlg, IDC_FEEDTITLE, tszTitle); + mir_free(tszTitle); EnableWindow(GetDlgItem(hwndDlg, IDC_DISCOVERY), TRUE); SetDlgItemText(hwndDlg, IDC_DISCOVERY, TranslateT("Check Feed")); } -- cgit v1.2.3