From 2a81bd5a12324512985116f17674c65a5906ed1d Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 25 Jul 2015 14:41:41 +0000 Subject: MenuEx: common project git-svn-id: http://svn.miranda-ng.org/main/trunk@14689 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/MenuItemEx/menuex.vcxproj | 28 ++++ plugins/MenuItemEx/menuex.vcxproj.filters | 4 + plugins/MenuItemEx/menuex_10.vcxproj | 210 -------------------------- plugins/MenuItemEx/menuex_10.vcxproj.filters | 53 ------- plugins/MenuItemEx/menuex_12.vcxproj | 213 --------------------------- plugins/MenuItemEx/menuex_12.vcxproj.filters | 53 ------- plugins/MenuItemEx/menuex_14.vcxproj | 213 --------------------------- plugins/MenuItemEx/menuex_14.vcxproj.filters | 53 ------- plugins/MenuItemEx/src/images.cpp | 2 +- plugins/MenuItemEx/src/main.cpp | 2 +- plugins/MenuItemEx/src/menuex.h | 67 --------- plugins/MenuItemEx/src/options.cpp | 2 +- plugins/MenuItemEx/src/stdafx.cpp | 18 --- plugins/MenuItemEx/src/stdafx.cxx | 18 +++ plugins/MenuItemEx/src/stdafx.h | 67 +++++++++ 23 files changed, 128 insertions(+), 891 deletions(-) create mode 100644 plugins/MenuItemEx/menuex.vcxproj create mode 100644 plugins/MenuItemEx/menuex.vcxproj.filters delete mode 100644 plugins/MenuItemEx/menuex_10.vcxproj delete mode 100644 plugins/MenuItemEx/menuex_10.vcxproj.filters delete mode 100644 plugins/MenuItemEx/menuex_12.vcxproj delete mode 100644 plugins/MenuItemEx/menuex_12.vcxproj.filters delete mode 100644 plugins/MenuItemEx/menuex_14.vcxproj delete mode 100644 plugins/MenuItemEx/menuex_14.vcxproj.filters delete mode 100644 plugins/MenuItemEx/src/menuex.h delete mode 100644 plugins/MenuItemEx/src/stdafx.cpp create mode 100644 plugins/MenuItemEx/src/stdafx.cxx create mode 100644 plugins/MenuItemEx/src/stdafx.h diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln index 5838cbb725..7f4a4b4d60 100644 --- a/bin10/mir_dev.sln +++ b/bin10/mir_dev.sln @@ -78,7 +78,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEView", "..\plugins\IEView EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IgnoreState", "..\plugins\IgnoreState\ignore.vcxproj", "{214F211F-1A2B-4F79-8993-B8DEE2EF7441}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex_10.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol_10.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" EndProject diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index 3588a87785..e7cea3f7f1 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -78,7 +78,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEView", "..\plugins\IEView EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IgnoreState", "..\plugins\IgnoreState\ignore.vcxproj", "{214F211F-1A2B-4F79-8993-B8DEE2EF7441}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex_10.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol_10.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" EndProject diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index c77852f557..fa607cb55c 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -78,7 +78,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEView", "..\plugins\IEView EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IgnoreState", "..\plugins\IgnoreState\ignore.vcxproj", "{214F211F-1A2B-4F79-8993-B8DEE2EF7441}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex_10.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol_10.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" EndProject diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln index 5ccbc3dffe..f980154352 100644 --- a/bin12/mir_dev.sln +++ b/bin12/mir_dev.sln @@ -80,7 +80,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEView", "..\plugins\IEView EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IgnoreState", "..\plugins\IgnoreState\ignore.vcxproj", "{214F211F-1A2B-4F79-8993-B8DEE2EF7441}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex_12.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol_12.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" EndProject diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln index 290bf29beb..84d5b026ff 100644 --- a/bin12/mir_full.sln +++ b/bin12/mir_full.sln @@ -80,7 +80,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEView", "..\plugins\IEView EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IgnoreState", "..\plugins\IgnoreState\ignore.vcxproj", "{214F211F-1A2B-4F79-8993-B8DEE2EF7441}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex_12.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol_12.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" EndProject diff --git a/bin14/mir_dev.sln b/bin14/mir_dev.sln index d862f4854a..938b03a94b 100644 --- a/bin14/mir_dev.sln +++ b/bin14/mir_dev.sln @@ -80,7 +80,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEView", "..\plugins\IEView EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IgnoreState", "..\plugins\IgnoreState\ignore.vcxproj", "{214F211F-1A2B-4F79-8993-B8DEE2EF7441}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex_14.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol_14.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" EndProject diff --git a/bin14/mir_full.sln b/bin14/mir_full.sln index b490d5293c..f15cba980d 100644 --- a/bin14/mir_full.sln +++ b/bin14/mir_full.sln @@ -80,7 +80,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEView", "..\plugins\IEView EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IgnoreState", "..\plugins\IgnoreState\ignore.vcxproj", "{214F211F-1A2B-4F79-8993-B8DEE2EF7441}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex_14.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MenuEx", "..\plugins\MenuItemEx\menuex.vcxproj", "{210DD88D-649B-4695-8C5F-898A4F60A8CE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mTextControl", "..\plugins\mTextControl\mtextcontrol_14.vcxproj", "{E26D2311-C164-48CF-BA24-5CEDA873D1B2}" EndProject diff --git a/build/vc.common/common.props b/build/vc.common/common.props index e326342866..9fa6933ed6 100644 --- a/build/vc.common/common.props +++ b/build/vc.common/common.props @@ -34,7 +34,7 @@ false - comctl32.lib;ws2_32.lib;UxTheme.lib;Iphlpapi.lib;%(AdditionalDependencies) + msimg32.lib;comctl32.lib;ws2_32.lib;UxTheme.lib;Iphlpapi.lib;%(AdditionalDependencies) $(CommonLibDir) true false diff --git a/plugins/MenuItemEx/menuex.vcxproj b/plugins/MenuItemEx/menuex.vcxproj new file mode 100644 index 0000000000..d4efb0be79 --- /dev/null +++ b/plugins/MenuItemEx/menuex.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + MenuEx + {210DD88D-649B-4695-8C5F-898A4F60A8CE} + + + + + \ No newline at end of file diff --git a/plugins/MenuItemEx/menuex.vcxproj.filters b/plugins/MenuItemEx/menuex.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/MenuItemEx/menuex.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/MenuItemEx/menuex_10.vcxproj b/plugins/MenuItemEx/menuex_10.vcxproj deleted file mode 100644 index 82d1ee534a..0000000000 --- a/plugins/MenuItemEx/menuex_10.vcxproj +++ /dev/null @@ -1,210 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - MenuEx - {210DD88D-649B-4695-8C5F-898A4F60A8CE} - - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - Level3 - EditAndContinue - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - menuex.h - Use - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - msimg32.lib;%(AdditionalDependencies) - true - 0x67100000 - false - $(IntDir)$(TargetName).lib - Windows - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - $(ProfileDir)..\..\bin10\lib - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - Level3 - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - menuex.h - Use - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - msimg32.lib;%(AdditionalDependencies) - true - 0x67100000 - false - $(IntDir)$(TargetName).lib - Windows - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - $(ProfileDir)..\..\bin10\lib - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - true - true - Level3 - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - menuex.h - Use - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - msimg32.lib;%(AdditionalDependencies) - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - true - true - true - 0x67100000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - true - true - Level3 - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - menuex.h - Use - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - msimg32.lib;%(AdditionalDependencies) - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - true - true - true - 0x67100000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - - - - Create - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/MenuItemEx/menuex_10.vcxproj.filters b/plugins/MenuItemEx/menuex_10.vcxproj.filters deleted file mode 100644 index 28a67e03d9..0000000000 --- a/plugins/MenuItemEx/menuex_10.vcxproj.filters +++ /dev/null @@ -1,53 +0,0 @@ - - - - - {a5d3095f-4b53-4f0d-aa86-7c1c110d5f16} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {508e535b-c848-4435-acaa-246bb95fa9f9} - h;hpp;hxx;hm;inl - - - {520ce12c-5f98-47c6-a52a-2c46665efddd} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/MenuItemEx/menuex_12.vcxproj b/plugins/MenuItemEx/menuex_12.vcxproj deleted file mode 100644 index f61b9a6283..0000000000 --- a/plugins/MenuItemEx/menuex_12.vcxproj +++ /dev/null @@ -1,213 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - MenuEx - {210DD88D-649B-4695-8C5F-898A4F60A8CE} - - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - Level4 - EditAndContinue - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - menuex.h - Use - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - msimg32.lib;%(AdditionalDependencies) - true - 0x67100000 - false - $(IntDir)$(TargetName).lib - Windows - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - $(ProfileDir)..\..\bin12\lib - false - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - Level4 - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - menuex.h - Use - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - msimg32.lib;%(AdditionalDependencies) - true - 0x67100000 - false - $(IntDir)$(TargetName).lib - Windows - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - $(ProfileDir)..\..\bin12\lib - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - true - true - Level4 - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - menuex.h - Use - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - msimg32.lib;%(AdditionalDependencies) - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - true - true - true - 0x67100000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin12\lib - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - true - true - Level4 - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - menuex.h - Use - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - msimg32.lib;%(AdditionalDependencies) - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - true - true - true - 0x67100000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin12\lib - - - - - - - - Create - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/MenuItemEx/menuex_12.vcxproj.filters b/plugins/MenuItemEx/menuex_12.vcxproj.filters deleted file mode 100644 index 28a67e03d9..0000000000 --- a/plugins/MenuItemEx/menuex_12.vcxproj.filters +++ /dev/null @@ -1,53 +0,0 @@ - - - - - {a5d3095f-4b53-4f0d-aa86-7c1c110d5f16} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {508e535b-c848-4435-acaa-246bb95fa9f9} - h;hpp;hxx;hm;inl - - - {520ce12c-5f98-47c6-a52a-2c46665efddd} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/MenuItemEx/menuex_14.vcxproj b/plugins/MenuItemEx/menuex_14.vcxproj deleted file mode 100644 index e91fed8b21..0000000000 --- a/plugins/MenuItemEx/menuex_14.vcxproj +++ /dev/null @@ -1,213 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - MenuEx - {210DD88D-649B-4695-8C5F-898A4F60A8CE} - - - - DynamicLibrary - Unicode - true - v140_xp - - - DynamicLibrary - Unicode - v140_xp - - - DynamicLibrary - Unicode - true - v140_xp - - - DynamicLibrary - Unicode - v140_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - Level4 - EditAndContinue - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - menuex.h - Use - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - msimg32.lib;%(AdditionalDependencies) - true - 0x67100000 - false - $(IntDir)$(TargetName).lib - Windows - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - $(ProfileDir)..\..\bin14\lib - false - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - Level4 - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - menuex.h - Use - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - msimg32.lib;%(AdditionalDependencies) - true - 0x67100000 - false - $(IntDir)$(TargetName).lib - Windows - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - $(ProfileDir)..\..\bin14\lib - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - true - true - Level4 - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - menuex.h - Use - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - msimg32.lib;%(AdditionalDependencies) - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - true - true - true - 0x67100000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin14\lib - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - true - true - Level4 - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - menuex.h - Use - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - msimg32.lib;%(AdditionalDependencies) - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - true - true - true - 0x67100000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin14\lib - - - - - - - - Create - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/MenuItemEx/menuex_14.vcxproj.filters b/plugins/MenuItemEx/menuex_14.vcxproj.filters deleted file mode 100644 index 28a67e03d9..0000000000 --- a/plugins/MenuItemEx/menuex_14.vcxproj.filters +++ /dev/null @@ -1,53 +0,0 @@ - - - - - {a5d3095f-4b53-4f0d-aa86-7c1c110d5f16} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {508e535b-c848-4435-acaa-246bb95fa9f9} - h;hpp;hxx;hm;inl - - - {520ce12c-5f98-47c6-a52a-2c46665efddd} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/MenuItemEx/src/images.cpp b/plugins/MenuItemEx/src/images.cpp index 451e694903..a6753392fb 100644 --- a/plugins/MenuItemEx/src/images.cpp +++ b/plugins/MenuItemEx/src/images.cpp @@ -1,4 +1,4 @@ -#include "menuex.h" +#include "stdafx.h" extern HINSTANCE hinstance; diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp index 57a8e7db05..21936d2049 100644 --- a/plugins/MenuItemEx/src/main.cpp +++ b/plugins/MenuItemEx/src/main.cpp @@ -1,4 +1,4 @@ -#include "menuex.h" +#include "stdafx.h" #define MS_SETINVIS "MenuEx/SetInvis" #define MS_SETVIS "MenuEx/SetVis" diff --git a/plugins/MenuItemEx/src/menuex.h b/plugins/MenuItemEx/src/menuex.h deleted file mode 100644 index cc23ddfb39..0000000000 --- a/plugins/MenuItemEx/src/menuex.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef MENUEX_H__ -#define MENUEX_H__ - -#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 "images.h" -#include "version.h" -#include "resource.h" - -#define MODULENAME "MenuItemEx" - -#define MIIM_STRING 0x00000040 - -extern PLUGININFOEX pluginInfoEx; - -int OptionsInit(WPARAM, LPARAM); - -#define MAX_PROTOS 32 -#define MAX_GROUPS 32 -#define MAX_IDLEN 16 - -#define VF_VS 0x00000001 -#define VF_SMNAME 0x00000002 -#define VF_HFL 0x00000004 -#define VF_IGN 0x00000008 -#define VF_PROTO 0x00000010 -#define VF_SHOWID 0x00000020 -#define VF_ADD 0x00000040 -#define VF_REQ 0x00000080 -#define VF_CID 0x00000100 -#define VF_RECV 0x00000200 -#define VF_STAT 0x00000400 -#define VF_CIDN 0x00000800 -#define VF_CIP 0x00001000 -#define VF_SAI 0x00002000 -#define VF_TRIMID 0x00004000 -#define VF_CMV 0x00008000 -#define VF_IGNH 0x00010000 - -#define CTRL_IS_PRESSED (GetAsyncKeyState(VK_CONTROL)&0x8000) - -extern const int vf_default; - -#endif diff --git a/plugins/MenuItemEx/src/options.cpp b/plugins/MenuItemEx/src/options.cpp index 40960b4c0b..03cc15895e 100644 --- a/plugins/MenuItemEx/src/options.cpp +++ b/plugins/MenuItemEx/src/options.cpp @@ -1,4 +1,4 @@ -#include "menuex.h" +#include "stdafx.h" extern HINSTANCE hinstance; extern BOOL bPopupService; diff --git a/plugins/MenuItemEx/src/stdafx.cpp b/plugins/MenuItemEx/src/stdafx.cpp deleted file mode 100644 index 15f54ac2a9..0000000000 --- a/plugins/MenuItemEx/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 "menuex.h" \ No newline at end of file diff --git a/plugins/MenuItemEx/src/stdafx.cxx b/plugins/MenuItemEx/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/MenuItemEx/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/MenuItemEx/src/stdafx.h b/plugins/MenuItemEx/src/stdafx.h new file mode 100644 index 0000000000..cc23ddfb39 --- /dev/null +++ b/plugins/MenuItemEx/src/stdafx.h @@ -0,0 +1,67 @@ +#ifndef MENUEX_H__ +#define MENUEX_H__ + +#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 "images.h" +#include "version.h" +#include "resource.h" + +#define MODULENAME "MenuItemEx" + +#define MIIM_STRING 0x00000040 + +extern PLUGININFOEX pluginInfoEx; + +int OptionsInit(WPARAM, LPARAM); + +#define MAX_PROTOS 32 +#define MAX_GROUPS 32 +#define MAX_IDLEN 16 + +#define VF_VS 0x00000001 +#define VF_SMNAME 0x00000002 +#define VF_HFL 0x00000004 +#define VF_IGN 0x00000008 +#define VF_PROTO 0x00000010 +#define VF_SHOWID 0x00000020 +#define VF_ADD 0x00000040 +#define VF_REQ 0x00000080 +#define VF_CID 0x00000100 +#define VF_RECV 0x00000200 +#define VF_STAT 0x00000400 +#define VF_CIDN 0x00000800 +#define VF_CIP 0x00001000 +#define VF_SAI 0x00002000 +#define VF_TRIMID 0x00004000 +#define VF_CMV 0x00008000 +#define VF_IGNH 0x00010000 + +#define CTRL_IS_PRESSED (GetAsyncKeyState(VK_CONTROL)&0x8000) + +extern const int vf_default; + +#endif -- cgit v1.2.3