diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-07-02 19:04:50 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-07-02 19:04:50 +0000 |
| commit | 0e9e528e18ff63d46e5b3471d6fa12344b0d28b3 (patch) | |
| tree | 2f3f3f7cfb248a3447451ab82760dc9aca5c98fe | |
| parent | 209e1040e34c50e424a7aa0a7c860c7fc279a76f (diff) | |
unified project for clist_modern
git-svn-id: http://svn.miranda-ng.org/main/trunk@14473 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
76 files changed, 234 insertions, 1459 deletions
diff --git a/plugins/Clist_modern/clist_modern.vcxproj b/plugins/Clist_modern/clist_modern.vcxproj new file mode 100644 index 0000000000..8c88af5879 --- /dev/null +++ b/plugins/Clist_modern/clist_modern.vcxproj @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectName>Clist_modern</ProjectName>
+ <ProjectGuid>{D9057E63-AAAA-4FE7-800A-20C02F4761F3}</ProjectGuid>
+ </PropertyGroup>
+ <ImportGroup Label="PropertySheets">
+ <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
+ </ImportGroup>
+</Project>
\ No newline at end of file diff --git a/plugins/Clist_modern/clist_modern.vcxproj.filters b/plugins/Clist_modern/clist_modern.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/Clist_modern/clist_modern.vcxproj.filters @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+</Project>
\ No newline at end of file diff --git a/plugins/Clist_modern/clist_modern_10.vcxproj b/plugins/Clist_modern/clist_modern_10.vcxproj deleted file mode 100644 index cf99c372d8..0000000000 --- a/plugins/Clist_modern/clist_modern_10.vcxproj +++ /dev/null @@ -1,281 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>Clist_modern</ProjectName>
- <ProjectGuid>{D9057E63-AAAA-4FE7-800A-20C02F4761F3}</ProjectGuid>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <IgnoreImportLibrary>true</IgnoreImportLibrary>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>false</ExceptionHandling>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <BufferSecurityCheck>true</BufferSecurityCheck>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>hdr/modern_commonheaders.h</PrecompiledHeaderFile>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>MSImg32.Lib;comctl32.lib;shlwapi.lib;gdiplus.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalManifestDependencies>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)</AdditionalManifestDependencies>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <SubSystem>Windows</SubSystem>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>false</ExceptionHandling>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <BufferSecurityCheck>true</BufferSecurityCheck>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>hdr/modern_commonheaders.h</PrecompiledHeaderFile>
- <WarningLevel>Level3</WarningLevel>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>MSImg32.Lib;comctl32.lib;shlwapi.lib;gdiplus.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalManifestDependencies>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)</AdditionalManifestDependencies>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <SubSystem>Windows</SubSystem>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <ExceptionHandling>false</ExceptionHandling>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <FloatingPointModel>Fast</FloatingPointModel>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>hdr/modern_commonheaders.h</PrecompiledHeaderFile>
- <WarningLevel>Level3</WarningLevel>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>MSImg32.Lib;comctl32.lib;shlwapi.lib;gdiplus.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalManifestDependencies>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)</AdditionalManifestDependencies>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <SubSystem>Windows</SubSystem>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
- <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <FloatingPointModel>Fast</FloatingPointModel>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>hdr/modern_commonheaders.h</PrecompiledHeaderFile>
- <WarningLevel>Level3</WarningLevel>
- <ExceptionHandling>false</ExceptionHandling>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>MSImg32.Lib;comctl32.lib;shlwapi.lib;gdiplus.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalManifestDependencies>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)</AdditionalManifestDependencies>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <SubSystem>Windows</SubSystem>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
- <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="src\CLUIFrames\cluiframes.cpp">
- <PrecompiledHeaderFile>../hdr/modern_commonheaders.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\CLUIFrames\groupmenu.cpp">
- <PrecompiledHeaderFile>../hdr/modern_commonheaders.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\init.cpp" />
- <ClCompile Include="src\modern_aniavatars.cpp" />
- <ClCompile Include="src\modern_awaymsg.cpp" />
- <ClCompile Include="src\modern_cachefuncs.cpp" />
- <ClCompile Include="src\modern_clc.cpp" />
- <ClCompile Include="src\modern_clcidents.cpp" />
- <ClCompile Include="src\modern_clcitems.cpp" />
- <ClCompile Include="src\modern_clcmsgs.cpp" />
- <ClCompile Include="src\modern_clcopts.cpp" />
- <ClCompile Include="src\modern_clcpaint.cpp" />
- <ClCompile Include="src\modern_clcutils.cpp" />
- <ClCompile Include="src\modern_clistevents.cpp" />
- <ClCompile Include="src\modern_clistmenus.cpp" />
- <ClCompile Include="src\modern_clistmod.cpp" />
- <ClCompile Include="src\modern_clistopts.cpp" />
- <ClCompile Include="src\modern_clistsettings.cpp" />
- <ClCompile Include="src\modern_clisttray.cpp" />
- <ClCompile Include="src\modern_clui.cpp" />
- <ClCompile Include="src\modern_cluiservices.cpp" />
- <ClCompile Include="src\modern_commonheaders.cpp">
- <PrecompiledHeader>Create</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\modern_contact.cpp" />
- <ClCompile Include="src\modern_docking.cpp" />
- <ClCompile Include="src\modern_gdiplus.cpp" />
- <ClCompile Include="src\modern_gettextasync.cpp" />
- <ClCompile Include="src\modern_global.cpp" />
- <ClCompile Include="src\modern_image_array.cpp" />
- <ClCompile Include="src\modern_keyboard.cpp" />
- <ClCompile Include="src\modern_log.cpp" />
- <ClCompile Include="src\modern_newrowopts.cpp" />
- <ClCompile Include="src\modern_row.cpp" />
- <ClCompile Include="src\modern_rowheight_funcs.cpp" />
- <ClCompile Include="src\modern_rowtemplateopt.cpp" />
- <ClCompile Include="src\modern_skinbutton.cpp" />
- <ClCompile Include="src\modern_skinengine.cpp" />
- <ClCompile Include="src\modern_skinopt.cpp" />
- <ClCompile Include="src\modern_skinselector.cpp" />
- <ClCompile Include="src\modern_statusbar.cpp" />
- <ClCompile Include="src\modern_statusbar_options.cpp" />
- <ClCompile Include="src\modern_sync.cpp" />
- <ClCompile Include="src\modern_tbbutton.cpp" />
- <ClCompile Include="src\modern_toolbar.cpp" />
- <ClCompile Include="src\modern_utils.cpp" />
- <ClCompile Include="src\modern_viewmodebar.cpp" />
- <ClCompile Include="src\modern_xptheme.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\CLUIFrames\cluiframes.h" />
- <ClInclude Include="src\hdr\modern_cache_funcs.h" />
- <ClInclude Include="src\hdr\modern_clc.h" />
- <ClInclude Include="src\hdr\modern_clcpaint.h" />
- <ClInclude Include="src\hdr\modern_clist.h" />
- <ClInclude Include="src\hdr\modern_clui.h" />
- <ClInclude Include="src\hdr\modern_commonheaders.h" />
- <ClInclude Include="src\hdr\modern_commonprototypes.h" />
- <ClInclude Include="src\hdr\modern_defsettings.h" />
- <ClInclude Include="src\hdr\modern_effectenum.h" />
- <ClInclude Include="src\hdr\modern_image_array.h" />
- <ClInclude Include="src\hdr\modern_log.h" />
- <ClInclude Include="src\hdr\modern_row.h" />
- <ClInclude Include="src\hdr\modern_rowheight_funcs.h" />
- <ClInclude Include="src\hdr\modern_skinengine.h" />
- <ClInclude Include="src\hdr\modern_static_clui.h" />
- <ClInclude Include="src\hdr\modern_static_cluiframes_service.h" />
- <ClInclude Include="src\hdr\modern_statusbar.h" />
- <ClInclude Include="src\hdr\modern_sync.h" />
- <ClInclude Include="src\hdr\modern_awaymsg.h" />
- <ClInclude Include="src\hdr\modern_gettextasync.h" />
- <ClInclude Include="src\hdr\modern_global_structure.h" />
- <ClInclude Include="src\hdr\modern_skinselector.h" />
- <ClInclude Include="src\resource.h" />
- <ClInclude Include="src\Version.h" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\resource.rc" />
- <ResourceCompile Include="res\version.rc" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/plugins/Clist_modern/clist_modern_10.vcxproj.filters b/plugins/Clist_modern/clist_modern_10.vcxproj.filters deleted file mode 100644 index 7c1674cd34..0000000000 --- a/plugins/Clist_modern/clist_modern_10.vcxproj.filters +++ /dev/null @@ -1,245 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4ca8c0fe-01e6-45f1-9621-3dd1395c7712}</UniqueIdentifier>
- <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{6250abc3-0ee9-43c9-a5db-62cefebbc60a}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{160168fd-2f10-425e-bd83-f37565fffc2c}</UniqueIdentifier>
- <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
- </Filter>
- <Filter Include="Source Files\CLUIFrames">
- <UniqueIdentifier>{826d2dcb-6f27-428e-a2bf-4825dc88ce32}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="src\init.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_aniavatars.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_awaymsg.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_cachefuncs.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clc.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clcidents.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clcitems.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clcmsgs.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clcopts.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clcpaint.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clcutils.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clistevents.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clistmenus.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clistmod.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clistopts.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clistsettings.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clisttray.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clui.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_cluiservices.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_commonheaders.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_contact.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_docking.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_gdiplus.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_gettextasync.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_global.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_image_array.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_keyboard.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_log.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_newrowopts.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_row.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_rowheight_funcs.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_rowtemplateopt.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_skinbutton.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_skinengine.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_skinopt.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_skinselector.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_statusbar.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_statusbar_options.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_sync.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_tbbutton.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_toolbar.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_viewmodebar.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_xptheme.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_utils.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\CLUIFrames\cluiframes.cpp">
- <Filter>Source Files\CLUIFrames</Filter>
- </ClCompile>
- <ClCompile Include="src\CLUIFrames\groupmenu.cpp">
- <Filter>Source Files\CLUIFrames</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\hdr\modern_commonheaders.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_skinselector.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_awaymsg.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_gettextasync.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_global_structure.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_cache_funcs.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_clc.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_clcpaint.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_clist.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_clui.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_commonprototypes.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_defsettings.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_effectenum.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_image_array.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_log.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_row.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_rowheight_funcs.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_skinengine.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_static_clui.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_static_cluiframes_service.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_statusbar.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_sync.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\resource.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\Version.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\CLUIFrames\cluiframes.h">
- <Filter>Source Files\CLUIFrames</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\version.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- <ResourceCompile Include="res\resource.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/plugins/Clist_modern/clist_modern_12.vcxproj b/plugins/Clist_modern/clist_modern_12.vcxproj deleted file mode 100644 index a9431c3af6..0000000000 --- a/plugins/Clist_modern/clist_modern_12.vcxproj +++ /dev/null @@ -1,290 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>Clist_modern</ProjectName>
- <ProjectGuid>{D9057E63-AAAA-4FE7-800A-20C02F4761F3}</ProjectGuid>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v120_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v120_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v120_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v120_xp</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <IgnoreImportLibrary>true</IgnoreImportLibrary>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>false</ExceptionHandling>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <BufferSecurityCheck>true</BufferSecurityCheck>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>hdr/modern_commonheaders.h</PrecompiledHeaderFile>
- <WarningLevel>Level4</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>MSImg32.Lib;comctl32.lib;shlwapi.lib;gdiplus.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalManifestDependencies>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)</AdditionalManifestDependencies>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <SubSystem>Windows</SubSystem>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
- <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>false</ExceptionHandling>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <BufferSecurityCheck>true</BufferSecurityCheck>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>hdr/modern_commonheaders.h</PrecompiledHeaderFile>
- <WarningLevel>Level4</WarningLevel>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>MSImg32.Lib;comctl32.lib;shlwapi.lib;gdiplus.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalManifestDependencies>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)</AdditionalManifestDependencies>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <SubSystem>Windows</SubSystem>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <ExceptionHandling>false</ExceptionHandling>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <FloatingPointModel>Fast</FloatingPointModel>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>hdr/modern_commonheaders.h</PrecompiledHeaderFile>
- <WarningLevel>Level4</WarningLevel>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>MSImg32.Lib;comctl32.lib;shlwapi.lib;gdiplus.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalManifestDependencies>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)</AdditionalManifestDependencies>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <SubSystem>Windows</SubSystem>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <FloatingPointModel>Fast</FloatingPointModel>
- <PrecompiledHeader>Use</PrecompiledHeader>
- <PrecompiledHeaderFile>hdr/modern_commonheaders.h</PrecompiledHeaderFile>
- <WarningLevel>Level4</WarningLevel>
- <ExceptionHandling>false</ExceptionHandling>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>MSImg32.Lib;comctl32.lib;shlwapi.lib;gdiplus.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalManifestDependencies>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)</AdditionalManifestDependencies>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <SubSystem>Windows</SubSystem>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="src\CLUIFrames\cluiframes.cpp">
- <PrecompiledHeaderFile>../hdr/modern_commonheaders.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\CLUIFrames\groupmenu.cpp">
- <PrecompiledHeaderFile>../hdr/modern_commonheaders.h</PrecompiledHeaderFile>
- </ClCompile>
- <ClCompile Include="src\init.cpp" />
- <ClCompile Include="src\modern_aniavatars.cpp" />
- <ClCompile Include="src\modern_awaymsg.cpp" />
- <ClCompile Include="src\modern_cachefuncs.cpp" />
- <ClCompile Include="src\modern_clc.cpp" />
- <ClCompile Include="src\modern_clcidents.cpp" />
- <ClCompile Include="src\modern_clcitems.cpp" />
- <ClCompile Include="src\modern_clcmsgs.cpp" />
- <ClCompile Include="src\modern_clcopts.cpp" />
- <ClCompile Include="src\modern_clcpaint.cpp" />
- <ClCompile Include="src\modern_clcutils.cpp" />
- <ClCompile Include="src\modern_clistevents.cpp" />
- <ClCompile Include="src\modern_clistmenus.cpp" />
- <ClCompile Include="src\modern_clistmod.cpp" />
- <ClCompile Include="src\modern_clistopts.cpp" />
- <ClCompile Include="src\modern_clistsettings.cpp" />
- <ClCompile Include="src\modern_clisttray.cpp" />
- <ClCompile Include="src\modern_clui.cpp" />
- <ClCompile Include="src\modern_cluiservices.cpp" />
- <ClCompile Include="src\modern_commonheaders.cpp">
- <PrecompiledHeader>Create</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="src\modern_contact.cpp" />
- <ClCompile Include="src\modern_docking.cpp" />
- <ClCompile Include="src\modern_gdiplus.cpp" />
- <ClCompile Include="src\modern_gettextasync.cpp" />
- <ClCompile Include="src\modern_global.cpp" />
- <ClCompile Include="src\modern_image_array.cpp" />
- <ClCompile Include="src\modern_keyboard.cpp" />
- <ClCompile Include="src\modern_log.cpp" />
- <ClCompile Include="src\modern_newrowopts.cpp" />
- <ClCompile Include="src\modern_row.cpp" />
- <ClCompile Include="src\modern_rowheight_funcs.cpp" />
- <ClCompile Include="src\modern_rowtemplateopt.cpp" />
- <ClCompile Include="src\modern_skinbutton.cpp" />
- <ClCompile Include="src\modern_skinengine.cpp" />
- <ClCompile Include="src\modern_skinopt.cpp" />
- <ClCompile Include="src\modern_skinselector.cpp" />
- <ClCompile Include="src\modern_statusbar.cpp" />
- <ClCompile Include="src\modern_statusbar_options.cpp" />
- <ClCompile Include="src\modern_sync.cpp" />
- <ClCompile Include="src\modern_tbbutton.cpp" />
- <ClCompile Include="src\modern_toolbar.cpp" />
- <ClCompile Include="src\modern_utils.cpp" />
- <ClCompile Include="src\modern_viewmodebar.cpp" />
- <ClCompile Include="src\modern_xptheme.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\CLUIFrames\cluiframes.h" />
- <ClInclude Include="src\hdr\modern_cache_funcs.h" />
- <ClInclude Include="src\hdr\modern_clc.h" />
- <ClInclude Include="src\hdr\modern_clcpaint.h" />
- <ClInclude Include="src\hdr\modern_clist.h" />
- <ClInclude Include="src\hdr\modern_clui.h" />
- <ClInclude Include="src\hdr\modern_commonheaders.h" />
- <ClInclude Include="src\hdr\modern_commonprototypes.h" />
- <ClInclude Include="src\hdr\modern_defsettings.h" />
- <ClInclude Include="src\hdr\modern_effectenum.h" />
- <ClInclude Include="src\hdr\modern_image_array.h" />
- <ClInclude Include="src\hdr\modern_log.h" />
- <ClInclude Include="src\hdr\modern_row.h" />
- <ClInclude Include="src\hdr\modern_rowheight_funcs.h" />
- <ClInclude Include="src\hdr\modern_skinengine.h" />
- <ClInclude Include="src\hdr\modern_static_clui.h" />
- <ClInclude Include="src\hdr\modern_static_cluiframes_service.h" />
- <ClInclude Include="src\hdr\modern_statusbar.h" />
- <ClInclude Include="src\hdr\modern_sync.h" />
- <ClInclude Include="src\hdr\modern_awaymsg.h" />
- <ClInclude Include="src\hdr\modern_gettextasync.h" />
- <ClInclude Include="src\hdr\modern_global_structure.h" />
- <ClInclude Include="src\hdr\modern_skinselector.h" />
- <ClInclude Include="src\resource.h" />
- <ClInclude Include="src\Version.h" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\resource.rc" />
- <ResourceCompile Include="res\version.rc" />
- </ItemGroup>
- <ItemGroup>
- <Image Include="res\Back.tga" />
- </ItemGroup>
- <ItemGroup>
- <None Include="res\skin.msf" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/plugins/Clist_modern/clist_modern_12.vcxproj.filters b/plugins/Clist_modern/clist_modern_12.vcxproj.filters deleted file mode 100644 index 71bd707a2a..0000000000 --- a/plugins/Clist_modern/clist_modern_12.vcxproj.filters +++ /dev/null @@ -1,255 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4ca8c0fe-01e6-45f1-9621-3dd1395c7712}</UniqueIdentifier>
- <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{6250abc3-0ee9-43c9-a5db-62cefebbc60a}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{160168fd-2f10-425e-bd83-f37565fffc2c}</UniqueIdentifier>
- <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
- </Filter>
- <Filter Include="Source Files\CLUIFrames">
- <UniqueIdentifier>{826d2dcb-6f27-428e-a2bf-4825dc88ce32}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="src\init.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_aniavatars.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_awaymsg.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_cachefuncs.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clc.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clcidents.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clcitems.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clcmsgs.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clcopts.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clcpaint.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clcutils.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clistevents.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clistmenus.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clistmod.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clistopts.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clistsettings.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clisttray.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_clui.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_cluiservices.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_commonheaders.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_contact.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_docking.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_gdiplus.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_gettextasync.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_global.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_image_array.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_keyboard.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_log.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_newrowopts.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_row.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_rowheight_funcs.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_rowtemplateopt.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_skinbutton.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_skinengine.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_skinopt.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_skinselector.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_statusbar.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_statusbar_options.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_sync.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_tbbutton.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_toolbar.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_viewmodebar.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_xptheme.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\modern_utils.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="src\CLUIFrames\cluiframes.cpp">
- <Filter>Source Files\CLUIFrames</Filter>
- </ClCompile>
- <ClCompile Include="src\CLUIFrames\groupmenu.cpp">
- <Filter>Source Files\CLUIFrames</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\hdr\modern_commonheaders.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_skinselector.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_awaymsg.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_gettextasync.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_global_structure.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_cache_funcs.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_clc.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_clcpaint.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_clist.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_clui.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_commonprototypes.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_defsettings.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_effectenum.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_image_array.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_log.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_row.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_rowheight_funcs.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_skinengine.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_static_clui.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_static_cluiframes_service.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_statusbar.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\hdr\modern_sync.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\resource.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\Version.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="src\CLUIFrames\cluiframes.h">
- <Filter>Source Files\CLUIFrames</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\version.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- <ResourceCompile Include="res\resource.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <Image Include="res\Back.tga">
- <Filter>Resource Files</Filter>
- </Image>
- </ItemGroup>
- <ItemGroup>
- <None Include="res\skin.msf">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/cluiframes.cpp index 000c96ad02..ae06306bb0 100644 --- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_modern/src/cluiframes.cpp @@ -22,14 +22,14 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "../hdr/modern_commonheaders.h"
+#include "stdafx.h"
#include "m_skin_eng.h"
-#include "../hdr/modern_commonprototypes.h"
-#include "../hdr/modern_sync.h"
+#include "modern_commonprototypes.h"
+#include "modern_sync.h"
// ALL THIS MODULE FUNCTION SHOULD BE EXECUTED FROM MAIN THREAD
-#include "../hdr/modern_static_cluiframes_service.h" // contain services initialization and proxiation
+#include "modern_static_cluiframes_service.h" // contain services initialization and proxiation
static const int UNCOLLAPSED_FRAME_SIZE = 0;
static const int DEFAULT_TITLEBAR_HEIGHT = 18;
diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.h b/plugins/Clist_modern/src/cluiframes.h index 09af1b44f2..09af1b44f2 100644 --- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.h +++ b/plugins/Clist_modern/src/cluiframes.h diff --git a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_modern/src/groupmenu.cpp index 5e6a01de74..c5b7781bb8 100644 --- a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp +++ b/plugins/Clist_modern/src/groupmenu.cpp @@ -21,13 +21,13 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "../hdr/modern_commonheaders.h"
+#include "stdafx.h"
#include "m_clui.h"
-#include "../hdr/modern_clist.h"
-#include "../hdr/modern_clc.h"
+#include "modern_clist.h"
+#include "modern_clc.h"
-//////////////////////////////Group MENU/////////////////////////
-int hGroupMenuObject;
+/////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////// Group MENU //////////////////////////////
HGENMENU hGroupMainMenuItemProxy;
HGENMENU hHideShowMainMenuItem;
@@ -43,48 +43,7 @@ HGENMENU hNewSubGroupMenuItem; void InitSubGroupMenus(void);
-//Groupmenu exec param(ownerdata)
-typedef struct
-{
- char *szServiceName;
- int Param1, Param2;
-}
-GroupMenuExecParam, *lpGroupMenuExecParam;
-
-INT_PTR BuildGroupMenu(WPARAM, LPARAM)
-{
- NotifyEventHooks(g_CluiData.hEventPreBuildGroupMenu, 0, 0);
-
- HMENU hMenu = CreatePopupMenu();
- Menu_Build(hMenu, hGroupMenuObject);
- return (INT_PTR)hMenu;
-}
-
-static INT_PTR AddGroupMenuItem(WPARAM wParam, LPARAM lParam)
-{
- lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)mir_calloc(sizeof(GroupMenuExecParam));
- if (mmep == NULL)
- return 0;
-
- TMO_MenuItem *pmi = (TMO_MenuItem*)lParam;
-
- // we need just one parametr.
- mmep->szServiceName = mir_strdup(pmi->pszService);
- GroupMenuParam *gmp = (GroupMenuParam*)wParam;
- if (gmp != NULL) {
- mmep->Param1 = gmp->wParam;
- mmep->Param2 = gmp->lParam;
- }
-
- HGENMENU hNewItem = Menu_AddItem(hGroupMenuObject, pmi, mmep);
-
- char buf[1024];
- mir_snprintf(buf, "%s/%s", pmi->pszService, pmi->name.a);
- Menu_ConfigureItem(hNewItem, MCI_OPT_UNIQUENAME, buf);
- return (INT_PTR)hNewItem;
-}
-
-INT_PTR GroupMenuonAddService(WPARAM wParam, LPARAM lParam)
+INT_PTR GroupMenuOnAddService(WPARAM wParam, LPARAM lParam)
{
MENUITEMINFO *mii = (MENUITEMINFO*)wParam;
if (mii == NULL)
@@ -102,40 +61,12 @@ INT_PTR GroupMenuonAddService(WPARAM wParam, LPARAM lParam) if (hGroupStatusMenuItemProxy == (HANDLE)lParam) {
mii->fMask |= MIIM_SUBMENU;
- mii->hSubMenu = (HMENU)Menu_GetStatusMenu();
+ mii->hSubMenu = Menu_GetStatusMenu();
}
return TRUE;
}
-//called with:
-//wparam - ownerdata
-//lparam - lparam from winproc
-INT_PTR GroupMenuExecService(WPARAM wParam, LPARAM lParam)
-{
- if (wParam != 0) {
- lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)wParam;
- if (!mir_strcmp(mmep->szServiceName, "Help/AboutCommand")) {
- //bug in help.c,it used wparam as parent window handle without reason.
- mmep->Param1 = 0;
- CallService(mmep->szServiceName, mmep->Param1, lParam);
- }
- else CallService(mmep->szServiceName, mmep->Param1, mmep->Param2);
- }
- return 1;
-}
-
-INT_PTR FreeOwnerDataGroupMenu(WPARAM, LPARAM lParam)
-{
- lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)lParam;
- if (mmep != NULL) {
- mir_free(mmep->szServiceName);
- mir_free(mmep);
- }
-
- return 0;
-}
-
INT_PTR HideGroupsHelper(WPARAM, LPARAM)
{
int newVal = !(GetWindowLongPtr(pcli->hwndContactTree, GWL_STYLE) & CLS_HIDEEMPTYGROUPS);
@@ -198,70 +129,59 @@ void GroupMenus_Init(void) void InitGroupMenus(void)
{
- CreateServiceFunction("CLISTMENUSGroup/ExecService", GroupMenuExecService);
- CreateServiceFunction("CLISTMENUSGroup/FreeOwnerDataGroupMenu", FreeOwnerDataGroupMenu);
- CreateServiceFunction("CLISTMENUSGroup/GroupMenuonAddService", GroupMenuonAddService);
+ CreateServiceFunction("CLISTMENUSGroup/GroupMenuOnAddService", GroupMenuOnAddService);
CreateServiceFunction("CLISTMENUSGroup/HideGroupsHelper", HideGroupsHelper);
CreateServiceFunction("CLISTMENUSGroup/UseGroupsHelper", UseGroupsHelper);
CreateServiceFunction("CLISTMENUSGroup/HideOfflineRootHelper", HideOfflineRootHelper);
CreateServiceFunction("CLISTMENUSGroup/CreateGroupHelper", CreateGroupHelper);
- CreateServiceFunction("CList/AddGroupMenuItem", AddGroupMenuItem);
- CreateServiceFunction(MS_CLIST_MENUBUILDGROUP, BuildGroupMenu);
-
HookEvent(ME_CLIST_PREBUILDGROUPMENU, OnBuildGroupMenu);
InitSubGroupMenus();
- // Group menu
- hGroupMenuObject = Menu_AddObject("GroupMenu", LPGEN("Group menu"), 0, "CLISTMENUSGroup/ExecService");
- Menu_ConfigureObject(hGroupMenuObject, MCO_OPT_USERDEFINEDITEMS, TRUE);
- Menu_ConfigureObject(hGroupMenuObject, MCO_OPT_FREE_SERVICE, "CLISTMENUSGroup/FreeOwnerDataGroupMenu");
- Menu_ConfigureObject(hGroupMenuObject, MCO_OPT_ONADD_SERVICE, "CLISTMENUSGroup/GroupMenuonAddService");
-
// add exit command to menu
CMenuItem mi;
mi.position = 1900000;
mi.pszService = "CloseAction";
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_EXIT);
mi.name.a = LPGEN("E&xit");
- AddGroupMenuItem(0, (LPARAM)&mi);
+ Menu_AddGroupMenuItem(&mi);
mi.position = 500;
mi.pszService = MS_CLIST_SHOWHIDE;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_SHOWHIDE);
mi.name.a = LPGEN("&Hide/show");
- hHideShowMainMenuItem = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);
+ hHideShowMainMenuItem = Menu_AddGroupMenuItem(&mi);
mi.position = 200000;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_FINDUSER);
mi.pszService = "FindAdd/FindAddCommand";
mi.name.a = LPGEN("&Find/add contacts...");
- AddGroupMenuItem(0, (LPARAM)&mi);
+ Menu_AddGroupMenuItem(&mi);
mi.position = 300000;
mi.pszService = "";
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_MAINMENU);
mi.name.a = LPGEN("&Main menu");
- hGroupMainMenuItemProxy = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);
+ hGroupMainMenuItemProxy = Menu_AddGroupMenuItem(&mi);
mi.position = 300100;
mi.pszService = "";
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_STATUS);
mi.name.a = LPGEN("&Status");
- hGroupStatusMenuItemProxy = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);
+ hGroupStatusMenuItemProxy = Menu_AddGroupMenuItem(&mi);
mi.position = 400000;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_OPTIONS);
mi.pszService = "Options/OptionsCommand";
mi.name.a = LPGEN("&Options...");
- AddGroupMenuItem(0, (LPARAM)&mi);
+ Menu_AddGroupMenuItem(&mi);
mi.position = 500000;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_MIRANDA);
mi.pszService = "Help/AboutCommand";
mi.name.a = LPGEN("&About");
- AddGroupMenuItem(0, (LPARAM)&mi);
+ Menu_AddGroupMenuItem(&mi);
GroupMenuParam gmp = {};
mi.flags = 0;
@@ -269,7 +189,7 @@ void InitGroupMenus(void) mi.hIcolibItem = iconItem[0].hIcolib;
mi.pszService = "CLISTMENUSGroup/CreateGroupHelper";
mi.name.a = LPGEN("&New group");
- hNewGroupMenuItem = (HGENMENU)AddGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);
+ hNewGroupMenuItem = Menu_AddGroupMenuItem(&mi, &gmp);
DestroyIcon_protect((HICON)mi.hIcolibItem);
mi.position = 100001;
@@ -277,44 +197,32 @@ void InitGroupMenus(void) mi.hIcolibItem = NULL;
mi.pszService = MS_CLIST_SETHIDEOFFLINE;
mi.name.a = LPGEN("&Hide offline users");
- gmp.lParam = 0; gmp.wParam = -1;
- hHideOfflineUsersMenuItem = (HGENMENU)AddGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);
+ gmp.wParam = -1;
+ hHideOfflineUsersMenuItem = Menu_AddGroupMenuItem(&mi, &gmp);
mi.position = 100002;
mi.pszService = "CLISTMENUSGroup/HideOfflineRootHelper";
mi.name.a = LPGEN("Hide &offline users out here");
- hHideOfflineUsersOutHereMenuItem = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);
+ hHideOfflineUsersOutHereMenuItem = Menu_AddGroupMenuItem(&mi);
mi.position = 100003;
mi.pszService = "CLISTMENUSGroup/HideGroupsHelper";
mi.name.a = LPGEN("Hide &empty groups");
- hHideEmptyGroupsMenuItem = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);
+ hHideEmptyGroupsMenuItem = Menu_AddGroupMenuItem(&mi);
mi.position = 100004;
mi.pszService = "CLISTMENUSGroup/UseGroupsHelper";
mi.name.a = LPGEN("Disable &groups");
- hDisableGroupsMenuItem = (HGENMENU)AddGroupMenuItem(0, (LPARAM)&mi);
+ hDisableGroupsMenuItem = Menu_AddGroupMenuItem(&mi);
}
-//////////////////////////////END Group MENU/////////////////////////
-
-//////////////////////////////SubGroup MENU/////////////////////////
-
-int hSubGroupMenuObject;
-
-HANDLE hSubGroupMainMenuItemProxy;
-HANDLE hSubGroupStatusMenuItemProxy;
+/////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////// SubGroup MENU //////////////////////////////
HGENMENU hHideOfflineUsersHereMenuItem, hShowOfflineUsersHereMenuItem;
-//SubGroupmenu exec param(ownerdata)
-typedef struct
-{
- char *szServiceName;
- int Param1, Param2;
-}
-SubGroupMenuExecParam, *lpSubGroupMenuExecParam;
-
+// wparam menu handle to pass to clc.c
+// lparam WM_COMMAND HWND
static int OnBuildSubGroupMenu(WPARAM wParam, LPARAM)
{
BOOL gray1 = FALSE;
@@ -341,54 +249,6 @@ static int OnBuildSubGroupMenu(WPARAM wParam, LPARAM) return 0;
}
-INT_PTR BuildSubGroupMenu(WPARAM wParam, LPARAM lParam)
-{
- NotifyEventHooks(g_CluiData.hEventPreBuildSubGroupMenu, wParam, 0);
-
- HMENU hMenu = CreatePopupMenu();
- Menu_Build(hMenu, hSubGroupMenuObject, wParam, lParam);
- return (INT_PTR)hMenu;
-}
-
-HMENU cliBuildGroupPopupMenu(ClcGroup *group)
-{
- return (HMENU)CallService(MS_CLIST_MENUBUILDSUBGROUP, (WPARAM)group, 0);
-}
-
-static INT_PTR AddSubGroupMenuItem(WPARAM wParam, LPARAM lParam)
-{
- lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)mir_calloc(sizeof(SubGroupMenuExecParam));
- if (mmep == NULL)
- return 0;
-
- TMO_MenuItem *pmi = (TMO_MenuItem*)lParam;
- // we need just one parametr.
- mmep->szServiceName = mir_strdup(pmi->pszService);
- GroupMenuParam *gmp = (GroupMenuParam*)wParam;
- if (gmp != NULL) {
- mmep->Param1 = gmp->wParam;
- mmep->Param2 = gmp->lParam;
- }
-
- HGENMENU hNewItem = Menu_AddItem(hSubGroupMenuObject, pmi, mmep);
-
- char buf[1024];
- mir_snprintf(buf, "%s/%s", pmi->pszService, pmi->name.a);
- Menu_ConfigureItem(hNewItem, MCI_OPT_UNIQUENAME, buf);
- return (INT_PTR)hNewItem;
-}
-
-INT_PTR SubGroupMenuCheckService(WPARAM wParam, LPARAM)
-{
- TCheckProcParam * CParam = (TCheckProcParam*)wParam;
- if (CParam) {
- lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)(CParam->MenuItemOwnerData);
- if (mmep)
- mmep->Param2 = CParam->lParam;
- }
- return 1;
-}
-
INT_PTR SubGroupMenuonAddService(WPARAM wParam, LPARAM)
{
MENUITEMINFO *mii = (MENUITEMINFO*)wParam;
@@ -398,36 +258,6 @@ INT_PTR SubGroupMenuonAddService(WPARAM wParam, LPARAM) return TRUE;
}
-//called with:
-//wparam - ownerdata
-//lparam - lparam from winproc
-INT_PTR SubGroupMenuExecService(WPARAM wParam, LPARAM lParam)
-{
- if (wParam != 0) {
- lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)wParam;
- if (!mir_strcmp(mmep->szServiceName, "Help/AboutCommand")) {
- //bug in help.c,it used wparam as parent window handle without reason.
- mmep->Param1 = 0;
- CallService(mmep->szServiceName, mmep->Param1, lParam);
- }
- else CallService(mmep->szServiceName, mmep->Param1, lParam);
- }
- return 1;
-}
-
-INT_PTR FreeOwnerDataSubGroupMenu(WPARAM, LPARAM lParam)
-{
- lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)lParam;
- if (mmep != NULL){
- mir_free(mmep->szServiceName);
- mir_free(mmep);
- }
-
- return 0;
-}
-
-//wparam menu handle to pass to clc.c
-//lparam WM_COMMAND HWND
INT_PTR GroupMenuExecProxy(WPARAM wParam, LPARAM lParam)
{
SendMessage(lParam ? (HWND)lParam : (HWND)pcli->hwndContactTree, WM_COMMAND, wParam, 0);
@@ -436,24 +266,11 @@ INT_PTR GroupMenuExecProxy(WPARAM wParam, LPARAM lParam) void InitSubGroupMenus(void)
{
- CreateServiceFunction("CLISTMENUSSubGroup/ExecService", SubGroupMenuExecService);
- CreateServiceFunction("CLISTMENUSSubGroup/FreeOwnerDataSubGroupMenu", FreeOwnerDataSubGroupMenu);
- CreateServiceFunction("CLISTMENUSSubGroup/SubGroupMenuonAddService", SubGroupMenuonAddService);
- CreateServiceFunction("CLISTMENUSSubGroup/SubGroupMenuCheckService", SubGroupMenuCheckService);
+ CreateServiceFunction("CLISTMENUSSubGroup/SubGroupMenuOnAddService", SubGroupMenuonAddService);
CreateServiceFunction("CLISTMENUSSubGroup/GroupMenuExecProxy", GroupMenuExecProxy);
- CreateServiceFunction("CList/AddSubGroupMenuItem", AddSubGroupMenuItem);
- CreateServiceFunction(MS_CLIST_MENUBUILDSUBGROUP, BuildSubGroupMenu);
-
HookEvent(ME_CLIST_PREBUILDSUBGROUPMENU, OnBuildSubGroupMenu);
- // SubGroup menu
- hSubGroupMenuObject = Menu_AddObject("SubGroupMenu", LPGEN("Subgroup menu"), 0, "CLISTMENUSSubGroup/ExecService");
- Menu_ConfigureObject(hSubGroupMenuObject, MCO_OPT_USERDEFINEDITEMS, TRUE);
- Menu_ConfigureObject(hSubGroupMenuObject, MCO_OPT_FREE_SERVICE, "CLISTMENUSSubGroup/FreeOwnerDataSubGroupMenu");
- Menu_ConfigureObject(hSubGroupMenuObject, MCO_OPT_ONADD_SERVICE, "CLISTMENUSSubGroup/SubGroupMenuonAddService");
- Menu_ConfigureObject(hSubGroupMenuObject, MCO_OPT_CHECK_SERVICE, "CLISTMENUSSubGroup/SubGroupMenuCheckService");
-
// add exit command to menu
GroupMenuParam gmp;
@@ -464,7 +281,7 @@ void InitSubGroupMenus(void) mi.name.a = LPGEN("&New subgroup");
gmp.lParam = 0;
gmp.wParam = POPUP_NEWSUBGROUP;
- hNewSubGroupMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);
+ hNewSubGroupMenuItem = Menu_AddSubGroupMenuItem(&mi, &gmp);
mi.position = 1001;
mi.hIcolibItem = NULL;
@@ -473,7 +290,7 @@ void InitSubGroupMenus(void) mi.name.a = LPGEN("&Hide offline users in here");
gmp.lParam = 0;
gmp.wParam = POPUP_GROUPHIDEOFFLINE;
- hHideOfflineUsersHereMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);
+ hHideOfflineUsersHereMenuItem = Menu_AddSubGroupMenuItem(&mi, &gmp);
mi.position = 1002;
mi.hIcolibItem = NULL;
@@ -481,7 +298,7 @@ void InitSubGroupMenus(void) mi.name.a = LPGEN("&Show offline users in here");
gmp.lParam = 0;
gmp.wParam = POPUP_GROUPSHOWOFFLINE;
- hShowOfflineUsersHereMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);
+ hShowOfflineUsersHereMenuItem = Menu_AddSubGroupMenuItem(&mi, &gmp);
memset(&mi, 0, sizeof(mi));
mi.position = 900001;
@@ -490,7 +307,7 @@ void InitSubGroupMenus(void) mi.name.a = LPGEN("&Rename group");
gmp.lParam = 0;
gmp.wParam = POPUP_RENAMEGROUP;
- AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);
+ Menu_AddSubGroupMenuItem(&mi, &gmp);
mi.position = 900002;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);
@@ -498,7 +315,5 @@ void InitSubGroupMenus(void) mi.name.a = LPGEN("&Delete group");
gmp.lParam = 0;
gmp.wParam = POPUP_DELETEGROUP;
- AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);
+ Menu_AddSubGroupMenuItem(&mi, &gmp);
}
-
-//////////////////////////////END SubGroup MENU/////////////////////////
diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp index 1be5809ace..c4ee6f98a0 100644 --- a/plugins/Clist_modern/src/init.cpp +++ b/plugins/Clist_modern/src/init.cpp @@ -23,12 +23,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
//include
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_commonprototypes.h"
+#include "stdafx.h"
+#include "modern_commonprototypes.h"
#include "version.h"
-#include "hdr/modern_clui.h"
-#include "hdr/modern_clcpaint.h"
+#include "modern_clui.h"
+#include "modern_clcpaint.h"
//definitions
@@ -166,7 +166,6 @@ static HRESULT SubclassClistInterface() pcli->pfnShowHide = cliShowHide;
pcli->pfnHitTest = cliHitTest;
pcli->pfnCompareContacts = cliCompareContacts;
- pcli->pfnBuildGroupPopupMenu = cliBuildGroupPopupMenu;
pcli->pfnGetIconFromStatusMode = cliGetIconFromStatusMode;
pcli->pfnFindItem = cliFindItem;
pcli->pfnGetRowByIndex = cliGetRowByIndex;
@@ -205,8 +204,6 @@ static HRESULT CreateHookableEvents() {
g_CluiData.hEventBkgrChanged = CreateHookableEvent(ME_BACKGROUNDCONFIG_CHANGED);
g_CluiData.hEventPreBuildTrayMenu = CreateHookableEvent(ME_CLIST_PREBUILDTRAYMENU);
- g_CluiData.hEventPreBuildGroupMenu = CreateHookableEvent(ME_CLIST_PREBUILDGROUPMENU);
- g_CluiData.hEventPreBuildSubGroupMenu = CreateHookableEvent(ME_CLIST_PREBUILDSUBGROUPMENU);
g_CluiData.hEventStatusBarShowToolTip = CreateHookableEvent(ME_CLIST_FRAMES_SB_SHOW_TOOLTIP);
g_CluiData.hEventStatusBarHideToolTip = CreateHookableEvent(ME_CLIST_FRAMES_SB_HIDE_TOOLTIP);
g_CluiData.hEventSkinServicesCreated = CreateHookableEvent(ME_SKIN_SERVICESCREATED);
diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp index 5fbbfea721..f6e36bd95a 100644 --- a/plugins/Clist_modern/src/modern_aniavatars.cpp +++ b/plugins/Clist_modern/src/modern_aniavatars.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // File contains implementation of animated avatars in contact list
-#include "hdr/modern_commonheaders.h"
+#include "stdafx.h"
#define IMMEDIATE_DRAW (!s_bSeparateWindow)
diff --git a/plugins/Clist_modern/src/modern_awaymsg.cpp b/plugins/Clist_modern/src/modern_awaymsg.cpp index 251217e4a0..f9a4510d83 100644 --- a/plugins/Clist_modern/src/modern_awaymsg.cpp +++ b/plugins/Clist_modern/src/modern_awaymsg.cpp @@ -30,9 +30,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //////////////////////////////////////////////////////////////////////////
// Module to Request Away Messages
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_awaymsg.h"
-#include "hdr/modern_sync.h"
+#include "stdafx.h"
+#include "modern_awaymsg.h"
+#include "modern_sync.h"
#define AMASKPERIOD 3000
diff --git a/plugins/Clist_modern/src/hdr/modern_awaymsg.h b/plugins/Clist_modern/src/modern_awaymsg.h index d99be87d2e..d99be87d2e 100644 --- a/plugins/Clist_modern/src/hdr/modern_awaymsg.h +++ b/plugins/Clist_modern/src/modern_awaymsg.h diff --git a/plugins/Clist_modern/src/hdr/modern_cache_funcs.h b/plugins/Clist_modern/src/modern_cache_funcs.h index f1b228f215..f1b228f215 100644 --- a/plugins/Clist_modern/src/hdr/modern_cache_funcs.h +++ b/plugins/Clist_modern/src/modern_cache_funcs.h diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp index 40dab74c2f..280a33acbd 100644 --- a/plugins/Clist_modern/src/modern_cachefuncs.cpp +++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp @@ -28,11 +28,11 @@ Modified by FYR ///////////////////////////////////////////////////////////////////////////////////////// // Module for working with lines text and avatars -#include "hdr/modern_commonheaders.h" -#include "hdr/modern_cache_funcs.h" +#include "stdafx.h" +#include "modern_cache_funcs.h" #include "newpluginapi.h" -#include "./hdr/modern_gettextasync.h" -#include "hdr/modern_sync.h" +#include "./modern_gettextasync.h" +#include "modern_sync.h" typedef BOOL(*ExecuteOnAllContactsFuncPtr) (ClcContact *contact, BOOL subcontact, void *param); diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index 5ee7d52875..754055f7dd 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -26,13 +26,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /* Module responsible for working with contact list control */ /************************************************************************/ -#include "hdr/modern_commonheaders.h" +#include "stdafx.h" #include "m_skin.h" -#include "hdr/modern_commonprototypes.h" +#include "modern_commonprototypes.h" -#include "hdr/modern_clc.h" -#include "hdr/modern_clist.h" -#include "hdr/modern_clcpaint.h" +#include "modern_clc.h" +#include "modern_clist.h" +#include "modern_clcpaint.h" #include "m_modernopt.h" diff --git a/plugins/Clist_modern/src/hdr/modern_clc.h b/plugins/Clist_modern/src/modern_clc.h index 7f6c2cb894..7f6c2cb894 100644 --- a/plugins/Clist_modern/src/hdr/modern_clc.h +++ b/plugins/Clist_modern/src/modern_clc.h diff --git a/plugins/Clist_modern/src/modern_clcidents.cpp b/plugins/Clist_modern/src/modern_clcidents.cpp index 8e04c56eea..3a933a1df7 100644 --- a/plugins/Clist_modern/src/modern_clcidents.cpp +++ b/plugins/Clist_modern/src/modern_clcidents.cpp @@ -22,9 +22,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_clc.h"
-#include "hdr/modern_commonprototypes.h"
+#include "stdafx.h"
+#include "modern_clc.h"
+#include "modern_commonprototypes.h"
#define CacheArrSize 255
ClcGroup *CacheIndex[CacheArrSize] = { NULL };
diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp index 4ebc0806bd..c7753ca7a1 100644 --- a/plugins/Clist_modern/src/modern_clcitems.cpp +++ b/plugins/Clist_modern/src/modern_clcitems.cpp @@ -22,11 +22,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "hdr/modern_commonheaders.h" -#include "hdr/modern_clc.h" -#include "hdr/modern_clist.h" +#include "stdafx.h" +#include "modern_clc.h" +#include "modern_clist.h" #include "m_metacontacts.h" -#include "hdr/modern_commonprototypes.h" +#include "modern_commonprototypes.h" void AddSubcontacts(ClcData *dat, ClcContact *cont, BOOL showOfflineHereGroup) { @@ -285,7 +285,7 @@ void cli_DeleteItemFromTree(HWND hwnd, MCONTACT hItem) ClearRowByIndexCache(); } -__inline BOOL CLCItems_IsShowOfflineGroup(ClcGroup* group) +BOOL CLCItems_IsShowOfflineGroup(ClcGroup* group) { DWORD groupFlags = 0; if (!group) return FALSE; diff --git a/plugins/Clist_modern/src/modern_clcmsgs.cpp b/plugins/Clist_modern/src/modern_clcmsgs.cpp index 849270026b..e8cf1a0e75 100644 --- a/plugins/Clist_modern/src/modern_clcmsgs.cpp +++ b/plugins/Clist_modern/src/modern_clcmsgs.cpp @@ -22,9 +22,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_clc.h"
-#include "hdr/modern_commonprototypes.h"
+#include "stdafx.h"
+#include "modern_clc.h"
+#include "modern_commonprototypes.h"
//processing of all the CLM_ messages incoming
diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index 6c2a3b15f6..6c63d290a0 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -22,15 +22,17 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_clc.h"
-#include "hdr/modern_commonprototypes.h"
-#include "hdr/modern_defsettings.h"
-#include "hdr/modern_effectenum.h"
-#include "hdr/modern_sync.h"
+#include "stdafx.h"
+#include "modern_clc.h"
+#include "modern_commonprototypes.h"
+#include "modern_defsettings.h"
+#include "modern_effectenum.h"
+#include "modern_sync.h"
#include <m_modernopt.h>
#include "m_fontservice.h"
+#pragma comment(lib, "shlwapi.lib")
+
INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
#define FONTF_NORMAL 0
diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp index f8c845ac65..bf337c1282 100644 --- a/plugins/Clist_modern/src/modern_clcpaint.cpp +++ b/plugins/Clist_modern/src/modern_clcpaint.cpp @@ -22,13 +22,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
+#include "stdafx.h"
-#include "hdr/modern_clc.h"
-#include "hdr/modern_skinengine.h"
-#include "hdr/modern_commonprototypes.h"
-#include "hdr/modern_row.h"
-#include "hdr/modern_clcpaint.h"
+#include "modern_clc.h"
+#include "modern_skinengine.h"
+#include "modern_commonprototypes.h"
+#include "modern_row.h"
+#include "modern_clcpaint.h"
CLCPaint g_clcPainter;
diff --git a/plugins/Clist_modern/src/hdr/modern_clcpaint.h b/plugins/Clist_modern/src/modern_clcpaint.h index 879452125f..879452125f 100644 --- a/plugins/Clist_modern/src/hdr/modern_clcpaint.h +++ b/plugins/Clist_modern/src/modern_clcpaint.h diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp index 9d16e85de7..8949cc7457 100644 --- a/plugins/Clist_modern/src/modern_clcutils.cpp +++ b/plugins/Clist_modern/src/modern_clcutils.cpp @@ -22,10 +22,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_clc.h"
-#include "hdr/modern_commonprototypes.h"
-#include "hdr/modern_defsettings.h"
+#include "stdafx.h"
+#include "modern_clc.h"
+#include "modern_commonprototypes.h"
+#include "modern_defsettings.h"
//loads of stuff that didn't really fit anywhere else
diff --git a/plugins/Clist_modern/src/hdr/modern_clist.h b/plugins/Clist_modern/src/modern_clist.h index 13bf41d6ad..13bf41d6ad 100644 --- a/plugins/Clist_modern/src/hdr/modern_clist.h +++ b/plugins/Clist_modern/src/modern_clist.h diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp index db9139c4b6..3793e806ca 100644 --- a/plugins/Clist_modern/src/modern_clistevents.cpp +++ b/plugins/Clist_modern/src/modern_clistevents.cpp @@ -22,11 +22,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
+#include "stdafx.h"
#include "m_clui.h"
-#include "hdr/modern_clist.h"
-#include "hdr/modern_commonprototypes.h"
-#include "hdr/modern_clcpaint.h"
+#include "modern_clist.h"
+#include "modern_commonprototypes.h"
+#include "modern_clcpaint.h"
/**************************************************/
/* Notify Event Area Frame implementation */
@@ -106,7 +106,7 @@ CListEvent* cli_AddEvent(CLISTEVENT *cle) if (p->cle.hContact != 0 && p->cle.hDbEvent != 1 && !(p->cle.flags & CLEF_ONLYAFEW)) {
MENUITEMINFO mii = { 0 };
- mii.cbSize = sizeof(mii); + mii.cbSize = sizeof(mii);
mii.fMask = MIIM_DATA | MIIM_BITMAP | MIIM_ID;
if (p->cle.pszService &&
(!strncmp("SRMsg/ReadMessage", p->cle.pszService, _countof("SRMsg/ReadMessage")) ||
diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp index 068a34b237..6d362e128c 100644 --- a/plugins/Clist_modern/src/modern_clistmenus.cpp +++ b/plugins/Clist_modern/src/modern_clistmenus.cpp @@ -22,11 +22,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_clist.h"
+#include "stdafx.h"
+#include "modern_clist.h"
#include "m_genmenu.h"
#include "m_clui.h"
-#include "hdr/modern_commonprototypes.h"
+#include "modern_commonprototypes.h"
int LoadFavoriteContactMenu();
int UnloadFavoriteContactMenu();
diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp index f4489c499d..e0b3a257be 100644 --- a/plugins/Clist_modern/src/modern_clistmod.cpp +++ b/plugins/Clist_modern/src/modern_clistmod.cpp @@ -22,19 +22,18 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_clist.h"
-#include "hdr/modern_commonprototypes.h"
-#include "hdr/modern_gettextasync.h"
-#include "hdr/modern_sync.h"
-#include "hdr/modern_clui.h"
+#include "stdafx.h"
+#include "modern_clist.h"
+#include "modern_commonprototypes.h"
+#include "modern_gettextasync.h"
+#include "modern_sync.h"
+#include "modern_clui.h"
#include <m_modernopt.h>
int OnLoadLangpack(WPARAM, LPARAM);
int CListMod_HideWindow();
-void GroupMenus_Init(void);
int AddMainMenuItem(WPARAM wParam, LPARAM lParam);
int AddContactMenuItem(WPARAM wParam, LPARAM lParam);
void UninitCListEvents(void);
diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp index 4173bb0751..f936d8f743 100644 --- a/plugins/Clist_modern/src/modern_clistopts.cpp +++ b/plugins/Clist_modern/src/modern_clistopts.cpp @@ -22,10 +22,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
+#include "stdafx.h"
#include "m_clui.h"
-#include "hdr/modern_clist.h"
-#include "hdr/modern_commonprototypes.h"
+#include "modern_clist.h"
+#include "modern_commonprototypes.h"
static INT_PTR CALLBACK DlgProcItemRowOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp index 466948d15f..28c36ab379 100644 --- a/plugins/Clist_modern/src/modern_clistsettings.cpp +++ b/plugins/Clist_modern/src/modern_clistsettings.cpp @@ -22,11 +22,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_clist.h"
-#include "hdr/modern_commonprototypes.h"
-#include "hdr/modern_awaymsg.h"
-#include "hdr/modern_gettextasync.h"
+#include "stdafx.h"
+#include "modern_clist.h"
+#include "modern_commonprototypes.h"
+#include "modern_awaymsg.h"
+#include "modern_gettextasync.h"
void InsertContactIntoTree(MCONTACT hContact, int status);
void CListSettings_FreeCacheItemDataOption(ClcCacheEntry *pDst, DWORD flag);
diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp index 583dec0ed8..234ec01839 100644 --- a/plugins/Clist_modern/src/modern_clisttray.cpp +++ b/plugins/Clist_modern/src/modern_clisttray.cpp @@ -22,11 +22,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
+#include "stdafx.h"
#include <m_clui.h>
-#include "hdr/modern_clist.h"
-#include "hdr/modern_commonprototypes.h"
-#include "hdr/modern_statusbar.h"
+#include "modern_clist.h"
+#include "modern_commonprototypes.h"
+#include "modern_statusbar.h"
#include <m_protoint.h>
int g_mutex_bOnTrayRightClick = 0;
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index d3711780ac..9a73b66c63 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -22,16 +22,16 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
+#include "stdafx.h"
#include "m_skinbutton.h"
-#include "hdr/modern_skinengine.h"
-#include "hdr/modern_statusbar.h"
+#include "modern_skinengine.h"
+#include "modern_statusbar.h"
-#include "hdr/modern_static_clui.h"
+#include "modern_static_clui.h"
#include <locale.h>
-#include "hdr/modern_clcpaint.h"
-#include "hdr/modern_sync.h"
+#include "modern_clcpaint.h"
+#include "modern_sync.h"
struct PROTOTICKS
{
@@ -147,7 +147,7 @@ OVERLAYICONINFO g_pStatusOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE + };
//////////////// CLUI CLASS IMPLEMENTATION // ///////////////////////////////
-#include "hdr/modern_clui.h"
+#include "modern_clui.h"
CLUI* CLUI::m_pCLUI = NULL;
BOOL CLUI::m_fMainMenuInited = FALSE;
@@ -2430,7 +2430,7 @@ LRESULT CLUI::OnContextMenu(UINT, WPARAM, LPARAM lParam) }
}
if (PtInRect(&rc, pt)) {
- HMENU hMenu = (HMENU)CallService(MS_CLIST_MENUBUILDGROUP, 0, 0);
+ HMENU hMenu = Menu_BuildGroupMenu();
TrackPopupMenu(hMenu, TPM_TOPALIGN | TPM_LEFTALIGN | TPM_LEFTBUTTON, pt.x, pt.y, 0, m_hWnd, NULL);
DestroyTrayMenu(hMenu);
}
diff --git a/plugins/Clist_modern/src/hdr/modern_clui.h b/plugins/Clist_modern/src/modern_clui.h index b9301670c2..b9301670c2 100644 --- a/plugins/Clist_modern/src/hdr/modern_clui.h +++ b/plugins/Clist_modern/src/modern_clui.h diff --git a/plugins/Clist_modern/src/modern_cluiservices.cpp b/plugins/Clist_modern/src/modern_cluiservices.cpp index 7a18e7d9e9..037b32f52f 100644 --- a/plugins/Clist_modern/src/modern_cluiservices.cpp +++ b/plugins/Clist_modern/src/modern_cluiservices.cpp @@ -22,8 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_commonprototypes.h"
+#include "stdafx.h"
+#include "modern_commonprototypes.h"
INT_PTR CListTray_GetGlobalStatus(WPARAM wparam, LPARAM lparam);
diff --git a/plugins/Clist_modern/src/modern_commonheaders.cpp b/plugins/Clist_modern/src/modern_commonheaders.cpp deleted file mode 100644 index d2c889fa24..0000000000 --- a/plugins/Clist_modern/src/modern_commonheaders.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#define DB_USEHELPERFUNCTIONS
-#include "hdr/modern_commonheaders.h"
diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/modern_commonprototypes.h index 7ea8b2d8dc..26e2e56bff 100644 --- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h +++ b/plugins/Clist_modern/src/modern_commonprototypes.h @@ -4,12 +4,12 @@ #define _COMMONPROTOTYPES
#ifndef commonheaders_h__
-#error "hdr/modern_commonheaders.h have to be including first"
+#error "stdafx.h have to be including first"
#endif
-#include "modern_commonheaders.h" //TO DO: Move contents of this file to commonheaders.h
+#include "stdafx.h" //TO DO: Move contents of this file to commonheaders.h
#include "modern_clist.h"
-#include "CLUIFrames/cluiframes.h"
+#include "cluiframes.h"
#include "modern_row.h"
#include "modern_skinengine.h"
#include "modern_skinselector.h"
@@ -281,7 +281,6 @@ int cliCompareContacts(const ClcContact *contact1, const ClcContact *contact int cliFindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);
int cliTrayIconPauseAutoHide(WPARAM wParam, LPARAM lParam);
void cliCluiProtocolStatusChanged(int status, const char * proto);
-HMENU cliBuildGroupPopupMenu(ClcGroup *group);
void cliInvalidateDisplayNameCacheEntry(MCONTACT hContact);
void cliCheckCacheItem(ClcCacheEntry *pdnce);
void cli_SaveStateAndRebuildList(HWND hwnd, ClcData *dat);
diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp index bfc6aab7fd..f6c0f299a5 100644 --- a/plugins/Clist_modern/src/modern_contact.cpp +++ b/plugins/Clist_modern/src/modern_contact.cpp @@ -22,10 +22,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
+#include "stdafx.h"
#include "m_clui.h"
-#include "hdr/modern_clist.h"
-#include "hdr/modern_commonprototypes.h"
+#include "modern_clist.h"
+#include "modern_commonprototypes.h"
struct
{
diff --git a/plugins/Clist_modern/src/hdr/modern_defsettings.h b/plugins/Clist_modern/src/modern_defsettings.h index 92c9bd2784..92c9bd2784 100644 --- a/plugins/Clist_modern/src/hdr/modern_defsettings.h +++ b/plugins/Clist_modern/src/modern_defsettings.h diff --git a/plugins/Clist_modern/src/modern_docking.cpp b/plugins/Clist_modern/src/modern_docking.cpp index 837bcfc797..9f7d491565 100644 --- a/plugins/Clist_modern/src/modern_docking.cpp +++ b/plugins/Clist_modern/src/modern_docking.cpp @@ -22,12 +22,12 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_clist.h"
+#include "stdafx.h"
+#include "modern_clist.h"
#include "m_skin_eng.h"
#include "m_skinbutton.h"
-#include "hdr/modern_commonprototypes.h"
-#include "hdr/modern_sync.h"
+#include "modern_commonprototypes.h"
+#include "modern_sync.h"
#define WM_DOCKCALLBACK (WM_USER+121)
#define WM_CREATEDOCKED (WM_USER+122)
diff --git a/plugins/Clist_modern/src/hdr/modern_effectenum.h b/plugins/Clist_modern/src/modern_effectenum.h index b15c4a1f11..b15c4a1f11 100644 --- a/plugins/Clist_modern/src/hdr/modern_effectenum.h +++ b/plugins/Clist_modern/src/modern_effectenum.h diff --git a/plugins/Clist_modern/src/modern_gdiplus.cpp b/plugins/Clist_modern/src/modern_gdiplus.cpp index 1ae96da1ab..e514870b7d 100644 --- a/plugins/Clist_modern/src/modern_gdiplus.cpp +++ b/plugins/Clist_modern/src/modern_gdiplus.cpp @@ -2,13 +2,14 @@ * test for gdi+
*/
-
-#include "hdr/modern_commonheaders.h"
+#include "stdafx.h"
#undef Translate //otherwise will conflict with gdi plus Translate
#include <gdiplus.h>
-#include "hdr/modern_global_structure.h"
+#include "modern_global_structure.h"
+
+#pragma comment(lib, "gdiplus.lib")
using namespace Gdiplus;
diff --git a/plugins/Clist_modern/src/modern_gettextasync.cpp b/plugins/Clist_modern/src/modern_gettextasync.cpp index b9bb6cdb72..43738f5246 100644 --- a/plugins/Clist_modern/src/modern_gettextasync.cpp +++ b/plugins/Clist_modern/src/modern_gettextasync.cpp @@ -30,10 +30,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //////////////////////////////////////////////////////////////////////////
// Module to async parsing of texts
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_gettextasync.h"
+#include "stdafx.h"
+#include "modern_gettextasync.h"
#include "newpluginapi.h"
-#include "hdr/modern_sync.h"
+#include "modern_sync.h"
int CLUI_SyncSetPDNCE(WPARAM wParam, LPARAM lParam);
int CLUI_SyncGetShortData(WPARAM wParam, LPARAM lParam);
diff --git a/plugins/Clist_modern/src/hdr/modern_gettextasync.h b/plugins/Clist_modern/src/modern_gettextasync.h index c53039da71..c53039da71 100644 --- a/plugins/Clist_modern/src/hdr/modern_gettextasync.h +++ b/plugins/Clist_modern/src/modern_gettextasync.h diff --git a/plugins/Clist_modern/src/modern_global.cpp b/plugins/Clist_modern/src/modern_global.cpp index af92dae599..46244c0866 100644 --- a/plugins/Clist_modern/src/modern_global.cpp +++ b/plugins/Clist_modern/src/modern_global.cpp @@ -22,7 +22,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 "hdr/modern_commonheaders.h"
+#include "stdafx.h"
//////////////////////////////////////////////////////////////////////////
// Global variables
diff --git a/plugins/Clist_modern/src/hdr/modern_global_structure.h b/plugins/Clist_modern/src/modern_global_structure.h index a7da9383ac..f6e94f3cb2 100644 --- a/plugins/Clist_modern/src/hdr/modern_global_structure.h +++ b/plugins/Clist_modern/src/modern_global_structure.h @@ -71,8 +71,6 @@ typedef struct tagCLUIDATA HANDLE hEventBkgrChanged;
HANDLE hEventPreBuildTrayMenu;
- HANDLE hEventPreBuildGroupMenu;
- HANDLE hEventPreBuildSubGroupMenu;
HANDLE hEventStatusBarShowToolTip;
HANDLE hEventStatusBarHideToolTip;
HANDLE hEventSkinServicesCreated;
diff --git a/plugins/Clist_modern/src/modern_image_array.cpp b/plugins/Clist_modern/src/modern_image_array.cpp index 9219e60712..f9ceede3a6 100644 --- a/plugins/Clist_modern/src/modern_image_array.cpp +++ b/plugins/Clist_modern/src/modern_image_array.cpp @@ -24,9 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Created by Pescuma
*/
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_image_array.h"
-#include "hdr/modern_commonprototypes.h"
+#include "stdafx.h"
+#include "modern_image_array.h"
+#include "modern_commonprototypes.h"
+
+#pragma comment(lib, "msimg32.lib")
static mir_cs cs;
diff --git a/plugins/Clist_modern/src/hdr/modern_image_array.h b/plugins/Clist_modern/src/modern_image_array.h index 00056edae0..00056edae0 100644 --- a/plugins/Clist_modern/src/hdr/modern_image_array.h +++ b/plugins/Clist_modern/src/modern_image_array.h diff --git a/plugins/Clist_modern/src/modern_keyboard.cpp b/plugins/Clist_modern/src/modern_keyboard.cpp index 55026ad3ac..1a5af4ee06 100644 --- a/plugins/Clist_modern/src/modern_keyboard.cpp +++ b/plugins/Clist_modern/src/modern_keyboard.cpp @@ -22,7 +22,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 "hdr/modern_commonheaders.h"
+#include "stdafx.h"
#include <m_hotkeys.h>
int InitSkinHotKeys(void);
diff --git a/plugins/Clist_modern/src/modern_log.cpp b/plugins/Clist_modern/src/modern_log.cpp index 780177c2a1..d051bb359d 100644 --- a/plugins/Clist_modern/src/modern_log.cpp +++ b/plugins/Clist_modern/src/modern_log.cpp @@ -1,4 +1,4 @@ -#include "hdr/modern_commonheaders.h"
+#include "stdafx.h"
#include <stdarg.h>
#include <stdio.h>
diff --git a/plugins/Clist_modern/src/hdr/modern_log.h b/plugins/Clist_modern/src/modern_log.h index b96eaafd65..b96eaafd65 100644 --- a/plugins/Clist_modern/src/hdr/modern_log.h +++ b/plugins/Clist_modern/src/modern_log.h diff --git a/plugins/Clist_modern/src/modern_newrowopts.cpp b/plugins/Clist_modern/src/modern_newrowopts.cpp index d435f7e0e2..7b090b6847 100644 --- a/plugins/Clist_modern/src/modern_newrowopts.cpp +++ b/plugins/Clist_modern/src/modern_newrowopts.cpp @@ -31,8 +31,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /************************************************************************/
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_clist.h"
+#include "stdafx.h"
+#include "modern_clist.h"
#define EMPTY_PLACE 255
#define COLUMNS_PLACE 254
diff --git a/plugins/Clist_modern/src/modern_row.cpp b/plugins/Clist_modern/src/modern_row.cpp index 52a530e276..1d1128e8ee 100644 --- a/plugins/Clist_modern/src/modern_row.cpp +++ b/plugins/Clist_modern/src/modern_row.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Created by Anton Senko aka ZORG , tweaked by Artem Shpynov aka FYR */ -#include "hdr/modern_commonheaders.h" +#include "stdafx.h" /* #include <windows.h> @@ -37,9 +37,9 @@ Created by Anton Senko aka ZORG , tweaked by Artem Shpynov aka FYR #include <string.h> #include <direct.h> #include "resource.h" -#include "hdr/modern_commonheaders.h" +#include "stdafx.h" */ -#include "hdr/modern_row.h" +#include "modern_row.h" //Futher declaration void rowCalculateMinSize(ROWCELL* cell); diff --git a/plugins/Clist_modern/src/hdr/modern_row.h b/plugins/Clist_modern/src/modern_row.h index ad84c94071..ad84c94071 100644 --- a/plugins/Clist_modern/src/hdr/modern_row.h +++ b/plugins/Clist_modern/src/modern_row.h diff --git a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp index aa07ffd865..25d1fa1b56 100644 --- a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp +++ b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp @@ -24,11 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Created by Pescuma, modified by Artem Shpynov
*/
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_rowheight_funcs.h"
-#include "hdr/modern_commonprototypes.h"
-#include "hdr/modern_row.h"
-#include "hdr/modern_clcpaint.h"
+#include "stdafx.h"
+#include "modern_rowheight_funcs.h"
+#include "modern_commonprototypes.h"
+#include "modern_row.h"
+#include "modern_clcpaint.h"
int g_mutex_nCalcRowHeightLock = 0;
int mod_CalcRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, int item);
diff --git a/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h b/plugins/Clist_modern/src/modern_rowheight_funcs.h index 439355e405..439355e405 100644 --- a/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h +++ b/plugins/Clist_modern/src/modern_rowheight_funcs.h diff --git a/plugins/Clist_modern/src/modern_rowtemplateopt.cpp b/plugins/Clist_modern/src/modern_rowtemplateopt.cpp index fa5ec60d54..23bce5e5a7 100644 --- a/plugins/Clist_modern/src/modern_rowtemplateopt.cpp +++ b/plugins/Clist_modern/src/modern_rowtemplateopt.cpp @@ -22,10 +22,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_clist.h"
-#include "hdr/modern_commonprototypes.h"
-#include "hdr/modern_row.h"
+#include "stdafx.h"
+#include "modern_clist.h"
+#include "modern_commonprototypes.h"
+#include "modern_row.h"
void RefreshTree(HWND hwndDlg, HTREEITEM hti);
static char* rowOptTmplStr;
diff --git a/plugins/Clist_modern/src/modern_skinbutton.cpp b/plugins/Clist_modern/src/modern_skinbutton.cpp index 4e78f1c789..6666b7e55f 100644 --- a/plugins/Clist_modern/src/modern_skinbutton.cpp +++ b/plugins/Clist_modern/src/modern_skinbutton.cpp @@ -26,9 +26,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. This file contains code related to new modern free positioned skinned buttons */ -#include "hdr/modern_commonheaders.h" -#include "hdr/modern_skinengine.h" -#include "hdr/modern_clcpaint.h" +#include "stdafx.h" +#include "modern_skinengine.h" +#include "modern_clcpaint.h" #include "m_skinbutton.h" #define MODERNSKINBUTTONCLASS "MirandaModernSkinButtonClass" diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp index 14c8216866..22b8d32f59 100644 --- a/plugins/Clist_modern/src/modern_skinengine.cpp +++ b/plugins/Clist_modern/src/modern_skinengine.cpp @@ -23,18 +23,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ //Include -#include "hdr/modern_commonheaders.h" +#include "stdafx.h" #include "m_skin_eng.h" -#include "hdr/modern_skinselector.h" -#include "CLUIFrames/cluiframes.h" +#include "modern_skinselector.h" +#include "cluiframes.h" #define _EFFECTENUM_FULL_H -#include "hdr/modern_effectenum.h" +#include "modern_effectenum.h" #undef _EFFECTENUM_FULL_H -#include "hdr/modern_skinengine.h" -#include "hdr/modern_commonprototypes.h" -#include "hdr/modern_sync.h" +#include "modern_skinengine.h" +#include "modern_commonprototypes.h" +#include "modern_sync.h" //Implementation diff --git a/plugins/Clist_modern/src/hdr/modern_skinengine.h b/plugins/Clist_modern/src/modern_skinengine.h index 70b7a9b838..70b7a9b838 100644 --- a/plugins/Clist_modern/src/hdr/modern_skinengine.h +++ b/plugins/Clist_modern/src/modern_skinengine.h diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp index d55aed2cd7..34ca2187cb 100644 --- a/plugins/Clist_modern/src/modern_skinopt.cpp +++ b/plugins/Clist_modern/src/modern_skinopt.cpp @@ -22,10 +22,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "hdr/modern_commonheaders.h" -#include "hdr/modern_clist.h" -#include "hdr/modern_commonprototypes.h" -#include "hdr/modern_sync.h" +#include "stdafx.h" +#include "modern_clist.h" +#include "modern_commonprototypes.h" +#include "modern_sync.h" /*******************************/ // Main skin selection routine // diff --git a/plugins/Clist_modern/src/modern_skinselector.cpp b/plugins/Clist_modern/src/modern_skinselector.cpp index 64c9aad075..a7921a1c4d 100644 --- a/plugins/Clist_modern/src/modern_skinselector.cpp +++ b/plugins/Clist_modern/src/modern_skinselector.cpp @@ -25,12 +25,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ///// structures and services to manage modern skin objects (mask mechanism)
//#include "windows.h"
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_skinselector.h"
-#include "hdr/modern_skinengine.h"
+#include "stdafx.h"
+#include "modern_skinselector.h"
+#include "modern_skinengine.h"
#include "m_skin_eng.h"
#include "m_skinbutton.h"
-#include "hdr/modern_commonprototypes.h"
+#include "modern_commonprototypes.h"
/// IMPLEMENTATIONS
char* ModernMaskToString(MODERNMASK *mm, char * buf, UINT bufsize)
diff --git a/plugins/Clist_modern/src/hdr/modern_skinselector.h b/plugins/Clist_modern/src/modern_skinselector.h index 16e6a574d0..51805a6ecf 100644 --- a/plugins/Clist_modern/src/hdr/modern_skinselector.h +++ b/plugins/Clist_modern/src/modern_skinselector.h @@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define M_MOD_SKIN_SELECTOR_H_INC
#include "newpluginapi.h"
-#include "modern_commonheaders.h"
+#include "stdafx.h"
#define MAXVALUE 20
diff --git a/plugins/Clist_modern/src/hdr/modern_static_clui.h b/plugins/Clist_modern/src/modern_static_clui.h index 8aea29123b..8aea29123b 100644 --- a/plugins/Clist_modern/src/hdr/modern_static_clui.h +++ b/plugins/Clist_modern/src/modern_static_clui.h diff --git a/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h b/plugins/Clist_modern/src/modern_static_cluiframes_service.h index 7a4ce4007a..7a4ce4007a 100644 --- a/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h +++ b/plugins/Clist_modern/src/modern_static_cluiframes_service.h diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp index e2b429d3a5..793fffc989 100644 --- a/plugins/Clist_modern/src/modern_statusbar.cpp +++ b/plugins/Clist_modern/src/modern_statusbar.cpp @@ -1,9 +1,9 @@ -#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_statusbar.h"
+#include "stdafx.h"
+#include "modern_statusbar.h"
#include "m_skin_eng.h"
-#include "hdr/modern_commonprototypes.h"
-#include "hdr/modern_clcpaint.h"
-#include "hdr/modern_sync.h"
+#include "modern_commonprototypes.h"
+#include "modern_clcpaint.h"
+#include "modern_sync.h"
BOOL tooltipshoing;
POINT lastpnt;
diff --git a/plugins/Clist_modern/src/hdr/modern_statusbar.h b/plugins/Clist_modern/src/modern_statusbar.h index 2ac385b6d4..2ac385b6d4 100644 --- a/plugins/Clist_modern/src/hdr/modern_statusbar.h +++ b/plugins/Clist_modern/src/modern_statusbar.h diff --git a/plugins/Clist_modern/src/modern_statusbar_options.cpp b/plugins/Clist_modern/src/modern_statusbar_options.cpp index 601dad4d04..63ccf96317 100644 --- a/plugins/Clist_modern/src/modern_statusbar_options.cpp +++ b/plugins/Clist_modern/src/modern_statusbar_options.cpp @@ -22,10 +22,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_clc.h"
-#include "hdr/modern_commonprototypes.h"
-#include "hdr/modern_defsettings.h"
+#include "stdafx.h"
+#include "modern_clc.h"
+#include "modern_commonprototypes.h"
+#include "modern_defsettings.h"
typedef struct _StatusBarProtocolOptions
{
diff --git a/plugins/Clist_modern/src/modern_sync.cpp b/plugins/Clist_modern/src/modern_sync.cpp index 8266c95660..7285758066 100644 --- a/plugins/Clist_modern/src/modern_sync.cpp +++ b/plugins/Clist_modern/src/modern_sync.cpp @@ -1,5 +1,5 @@ -#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_sync.h"
+#include "stdafx.h"
+#include "modern_sync.h"
static INT_PTR SyncCaller(WPARAM proc, LPARAM lParam)
{
diff --git a/plugins/Clist_modern/src/hdr/modern_sync.h b/plugins/Clist_modern/src/modern_sync.h index 0b5a827f11..0b5a827f11 100644 --- a/plugins/Clist_modern/src/hdr/modern_sync.h +++ b/plugins/Clist_modern/src/modern_sync.h diff --git a/plugins/Clist_modern/src/modern_tbbutton.cpp b/plugins/Clist_modern/src/modern_tbbutton.cpp index dbf6a79907..6644f0a846 100644 --- a/plugins/Clist_modern/src/modern_tbbutton.cpp +++ b/plugins/Clist_modern/src/modern_tbbutton.cpp @@ -1,7 +1,7 @@ -#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_commonprototypes.h"
+#include "stdafx.h"
+#include "modern_commonprototypes.h"
#include "m_skinbutton.h"
-#include "hdr/modern_clcpaint.h"
+#include "modern_clcpaint.h"
#include <m_button_int.h>
#include <m_toptoolbar.h>
diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp index a3cba86884..068462bc3e 100644 --- a/plugins/Clist_modern/src/modern_toolbar.cpp +++ b/plugins/Clist_modern/src/modern_toolbar.cpp @@ -24,11 +24,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_commonprototypes.h"
+#include "stdafx.h"
+#include "modern_commonprototypes.h"
#include "m_skinbutton.h"
#include <m_toptoolbar.h>
-#include "hdr/modern_sync.h"
+#include "modern_sync.h"
struct
{
diff --git a/plugins/Clist_modern/src/modern_utils.cpp b/plugins/Clist_modern/src/modern_utils.cpp index b68088679c..196398b68f 100644 --- a/plugins/Clist_modern/src/modern_utils.cpp +++ b/plugins/Clist_modern/src/modern_utils.cpp @@ -1,4 +1,4 @@ -#include "hdr/modern_commonheaders.h"
+#include "stdafx.h"
BYTE gl_TrimText = 1;
diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index faea096349..bec68bae1d 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -27,8 +27,8 @@ $Id: viewmodes.c 2998 2006-06-01 07:11:52Z nightwish2004 $ */
-#include "hdr/modern_commonheaders.h"
-#include "CLUIFrames/cluiframes.h"
+#include "stdafx.h"
+#include "cluiframes.h"
#include "m_skinbutton.h"
#define TIMERID_VIEWMODEEXPIRE 100
diff --git a/plugins/Clist_modern/src/modern_xptheme.cpp b/plugins/Clist_modern/src/modern_xptheme.cpp index 1d8fd910f5..a135642061 100644 --- a/plugins/Clist_modern/src/modern_xptheme.cpp +++ b/plugins/Clist_modern/src/modern_xptheme.cpp @@ -1,5 +1,5 @@ -#include "hdr/modern_commonheaders.h"
-#include "hdr/modern_commonprototypes.h"
+#include "stdafx.h"
+#include "modern_commonprototypes.h"
#include "m_xpTheme.h"
diff --git a/plugins/Clist_modern/src/stdafx.cxx b/plugins/Clist_modern/src/stdafx.cxx new file mode 100644 index 0000000000..f60995429a --- /dev/null +++ b/plugins/Clist_modern/src/stdafx.cxx @@ -0,0 +1,3 @@ +#define DB_USEHELPERFUNCTIONS
+
+#include "stdafx.h"
diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/stdafx.h index 9192a73d2d..d7ec890625 100644 --- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h +++ b/plugins/Clist_modern/src/stdafx.h @@ -101,11 +101,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "modern_global_structure.h"
#include "modern_clc.h"
#include "modern_clist.h"
-#include "CLUIFrames/cluiframes.h"
+#include "cluiframes.h"
#include "modern_rowheight_funcs.h"
#include "modern_cache_funcs.h"
#include "modern_log.h"
-#include "../resource.h"
+#include "resource.h"
#define DEFAULT_SKIN_FOLDER "Skins\\Modern contact list"
extern TCHAR SkinsFolder[MAX_PATH];
|