PasteIt, PopUp, ProfileManager: changed folder structure

git-svn-id: http://svn.miranda-ng.org/main/trunk@1117 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

38 files changed, 106 insertions, 276 deletions

diff --git a/plugins/PasteIt/PasteIt.vcxproj b/plugins/PasteIt/PasteIt.vcxproj
index b0f5cae238..68f324aa64 100644
--- a/plugins/PasteIt/PasteIt.vcxproj
+++ b/plugins/PasteIt/PasteIt.vcxproj
@@ -77,7 +77,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PASTEIT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

@@ -97,7 +97,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;PASTEIT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

@@ -119,7 +119,7 @@
       <Optimization>Full</Optimization>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PASTEIT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

@@ -144,7 +144,7 @@
       <Optimization>Full</Optimization>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;PASTEIT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

@@ -163,36 +163,27 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClInclude Include="Options.h" />

-    <ClInclude Include="PasteToWeb.h" />

-    <ClInclude Include="PasteToWeb1.h" />

-    <ClInclude Include="PasteToWeb2.h" />

-    <ClInclude Include="resource.h" />

-    <ClInclude Include="stdafx.h" />

-    <ClInclude Include="targetver.h" />

-    <ClInclude Include="version.h" />

+    <ClInclude Include="src\Options.h" />

+    <ClInclude Include="src\PasteToWeb.h" />

+    <ClInclude Include="src\PasteToWeb1.h" />

+    <ClInclude Include="src\PasteToWeb2.h" />

+    <ClInclude Include="src\resource.h" />

+    <ClInclude Include="src\stdafx.h" />

+    <ClInclude Include="src\targetver.h" />

+    <ClInclude Include="src\version.h" />

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="Options.cpp" />

-    <ClCompile Include="PasteIt.cpp">

+    <ClCompile Include="src\Options.cpp" />

+    <ClCompile Include="src\PasteIt.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="PasteToWeb.cpp" />

-    <ClCompile Include="PasteToWeb1.cpp" />

-    <ClCompile Include="PasteToWeb2.cpp" />

+    <ClCompile Include="src\PasteToWeb.cpp" />

+    <ClCompile Include="src\PasteToWeb1.cpp" />

+    <ClCompile Include="src\PasteToWeb2.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="PasteIt.rc" />

-    <ResourceCompile Include="version.rc" />

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="Docs\PasteIt_langpack_polish.txt" />

-    <None Include="Docs\PasteIt_licence.txt" />

-    <None Include="Docs\PasteIt_readme.txt" />

-    <None Include="Docs\PasteIt_translate.txt">

-      <DeploymentContent>false</DeploymentContent>

-    </None>

-    <None Include="icons\Paste.ico" />

+    <ResourceCompile Include="res\PasteIt.rc" />

+    <ResourceCompile Include="res\version.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/PasteIt/PasteIt.vcxproj.filters b/plugins/PasteIt/PasteIt.vcxproj.filters
index 494819693d..ff39f578c7 100644
--- a/plugins/PasteIt/PasteIt.vcxproj.filters
+++ b/plugins/PasteIt/PasteIt.vcxproj.filters
@@ -13,76 +13,56 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>

     </Filter>

-    <Filter Include="Resource Files\Docs">

-      <UniqueIdentifier>{e6bd3d70-0d30-4cf4-a284-c0fd38c83fa5}</UniqueIdentifier>

-    </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="stdafx.h">

+    <ClInclude Include="src\stdafx.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="targetver.h">

+    <ClInclude Include="src\targetver.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="PasteToWeb.h">

+    <ClInclude Include="src\PasteToWeb.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="PasteToWeb1.h">

+    <ClInclude Include="src\PasteToWeb1.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="PasteToWeb2.h">

+    <ClInclude Include="src\PasteToWeb2.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="version.h">

+    <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

+    <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="Options.h">

+    <ClInclude Include="src\Options.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="PasteIt.cpp">

+    <ClCompile Include="src\PasteIt.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="PasteToWeb.cpp">

+    <ClCompile Include="src\PasteToWeb.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="PasteToWeb1.cpp">

+    <ClCompile Include="src\PasteToWeb1.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="PasteToWeb2.cpp">

+    <ClCompile Include="src\PasteToWeb2.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="Options.cpp">

+    <ClCompile Include="src\Options.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="version.rc">

+    <ResourceCompile Include="res\version.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="PasteIt.rc">

+    <ResourceCompile Include="res\PasteIt.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

-  <ItemGroup>

-    <None Include="icons\Paste.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Docs\PasteIt_licence.txt">

-      <Filter>Resource Files\Docs</Filter>

-    </None>

-    <None Include="Docs\PasteIt_translate.txt">

-      <Filter>Resource Files\Docs</Filter>

-    </None>

-    <None Include="Docs\PasteIt_langpack_polish.txt">

-      <Filter>Resource Files\Docs</Filter>

-    </None>

-    <None Include="Docs\PasteIt_readme.txt">

-      <Filter>Resource Files\Docs</Filter>

-    </None>

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/PasteIt/PasteIt.vcxproj.user b/plugins/PasteIt/PasteIt.vcxproj.user
new file mode 100644
index 0000000000..695b5c78b9
--- /dev/null
+++ b/plugins/PasteIt/PasteIt.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+</Project>
\ No newline at end of file
diff --git a/plugins/PasteIt/icons/Paste.ico b/plugins/PasteIt/res/Paste.ico
index 54e8087326..54e8087326 100644
--- a/plugins/PasteIt/icons/Paste.ico
+++ b/plugins/PasteIt/res/Paste.ico
diff --git a/plugins/PasteIt/PasteIt.rc b/plugins/PasteIt/res/PasteIt.rc
index e428a849ab..69ec37137e 100644
--- a/plugins/PasteIt/PasteIt.rc
+++ b/plugins/PasteIt/res/PasteIt.rc
@@ -1,4 +1,4 @@
-#include "resource.h"

+#include "..\src\resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -134,7 +134,7 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_MENU                ICON                    "icons\\Paste.ico"

+IDI_MENU                ICON                    "Paste.ico"

 #endif    // Neutral resources

 /////////////////////////////////////////////////////////////////////////////

 

diff --git a/plugins/PasteIt/version.rc b/plugins/PasteIt/res/version.rc
index 5c39da0829..afa2d43620 100644
--- a/plugins/PasteIt/version.rc
+++ b/plugins/PasteIt/res/version.rc
@@ -3,7 +3,7 @@
 #endif //APSTUDIO_INVOKED

 

 #include <windows.h>

-#include "version.h"

+#include "..\src\version.h"

 

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION __FILEVERSION_STRING

diff --git a/plugins/PasteIt/Options.cpp b/plugins/PasteIt/src/Options.cpp
index 49309bc580..49309bc580 100644
--- a/plugins/PasteIt/Options.cpp
+++ b/plugins/PasteIt/src/Options.cpp
diff --git a/plugins/PasteIt/Options.h b/plugins/PasteIt/src/Options.h
index 9e58e44d7f..9e58e44d7f 100644
--- a/plugins/PasteIt/Options.h
+++ b/plugins/PasteIt/src/Options.h
diff --git a/plugins/PasteIt/PasteIt.cpp b/plugins/PasteIt/src/PasteIt.cpp
index ce38743f68..ce38743f68 100644
--- a/plugins/PasteIt/PasteIt.cpp
+++ b/plugins/PasteIt/src/PasteIt.cpp
diff --git a/plugins/PasteIt/PasteToWeb.cpp b/plugins/PasteIt/src/PasteToWeb.cpp
index a7cc9a3b5f..a7cc9a3b5f 100644
--- a/plugins/PasteIt/PasteToWeb.cpp
+++ b/plugins/PasteIt/src/PasteToWeb.cpp
diff --git a/plugins/PasteIt/PasteToWeb.h b/plugins/PasteIt/src/PasteToWeb.h
index 51e2141790..51e2141790 100644
--- a/plugins/PasteIt/PasteToWeb.h
+++ b/plugins/PasteIt/src/PasteToWeb.h
diff --git a/plugins/PasteIt/PasteToWeb1.cpp b/plugins/PasteIt/src/PasteToWeb1.cpp
index bbdc2e1ba5..bbdc2e1ba5 100644
--- a/plugins/PasteIt/PasteToWeb1.cpp
+++ b/plugins/PasteIt/src/PasteToWeb1.cpp
diff --git a/plugins/PasteIt/PasteToWeb1.h b/plugins/PasteIt/src/PasteToWeb1.h
index b1611855d6..b1611855d6 100644
--- a/plugins/PasteIt/PasteToWeb1.h
+++ b/plugins/PasteIt/src/PasteToWeb1.h
diff --git a/plugins/PasteIt/PasteToWeb2.cpp b/plugins/PasteIt/src/PasteToWeb2.cpp
index c2edbddeef..c2edbddeef 100644
--- a/plugins/PasteIt/PasteToWeb2.cpp
+++ b/plugins/PasteIt/src/PasteToWeb2.cpp
diff --git a/plugins/PasteIt/PasteToWeb2.h b/plugins/PasteIt/src/PasteToWeb2.h
index 364c6eb4e4..364c6eb4e4 100644
--- a/plugins/PasteIt/PasteToWeb2.h
+++ b/plugins/PasteIt/src/PasteToWeb2.h
diff --git a/plugins/PasteIt/resource.h b/plugins/PasteIt/src/resource.h
index cbfa566679..cbfa566679 100644
--- a/plugins/PasteIt/resource.h
+++ b/plugins/PasteIt/src/resource.h
diff --git a/plugins/PasteIt/stdafx.h b/plugins/PasteIt/src/stdafx.h
index 2be1eff36d..2be1eff36d 100644
--- a/plugins/PasteIt/stdafx.h
+++ b/plugins/PasteIt/src/stdafx.h
diff --git a/plugins/PasteIt/targetver.h b/plugins/PasteIt/src/targetver.h
index 90e767bfce..90e767bfce 100644
--- a/plugins/PasteIt/targetver.h
+++ b/plugins/PasteIt/src/targetver.h
diff --git a/plugins/PasteIt/version.h b/plugins/PasteIt/src/version.h
index e7d016c0a4..e7d016c0a4 100644
--- a/plugins/PasteIt/version.h
+++ b/plugins/PasteIt/src/version.h
diff --git a/plugins/Popup/PopUp_10.vcxproj b/plugins/Popup/PopUp_10.vcxproj
index d58d67ad27..e58bc2812a 100644
--- a/plugins/Popup/PopUp_10.vcxproj
+++ b/plugins/Popup/PopUp_10.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUP_EXPORTS;MTEXT_NOHELPERS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>

@@ -98,7 +98,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;POPUP_EXPORTS;MTEXT_NOHELPERS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>

@@ -123,7 +123,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUP_EXPORTS;MTEXT_NOHELPERS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -152,7 +152,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;POPUP_EXPORTS;MTEXT_NOHELPERS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;MTEXT_NOHELPERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -223,7 +223,7 @@
     <ClInclude Include="src\popup_gdiplus.h" />

     <ClInclude Include="src\popup_thread.h" />

     <ClInclude Include="src\popup_wnd2.h" />

-    <ClInclude Include="resource.h" />

+    <ClInclude Include="src\resource.h" />

     <ClInclude Include="src\services.h" />

     <ClInclude Include="src\skin.h" />

     <ClInclude Include="src\srmm_menu.h" />

@@ -238,46 +238,11 @@
     <ClInclude Include="src\opt_skins.h" />

     <ClInclude Include="src\opttree.h" />

     <ClInclude Include="src\common.h" />

-    <ClInclude Include="version.h" />

+    <ClInclude Include="src\version.h" />

   </ItemGroup>

   <ItemGroup>

-    <None Include="res\add.ico" />

-    <None Include="res\avatar.bmp" />

-    <None Include="res\block.ico" />

-    <None Include="res\Check_off.ico" />

-    <None Include="res\Check_on.ico" />

-    <None Include="res\classic.popupskin" />

-    <None Include="res\close.ico" />

-    <None Include="res\error.ico" />

-    <None Include="res\favorite.ico" />

-    <None Include="res\fullscreen.ico" />

-    <None Include="res\img.ico" />

-    <None Include="res\info.ico" />

-    <None Include="res\menu.ico" />

-    <None Include="res\message.ico" />

-    <None Include="res\notify.ico" />

-    <None Include="res\ok.ico" />

-    <None Include="res\pin.ico" />

-    <None Include="res\pinned.ico" />

-    <None Include="res\popup.ico" />

-    <None Include="res\popup_fav.ico" />

-    <None Include="res\popup_fs.ico" />

-    <None Include="res\popup_group.ico" />

-    <None Include="res\popup_history.ico" />

-    <None Include="res\popup_no.ico" />

-    <None Include="res\popup_plus.ico" />

-    <None Include="res\Radio_off.ico" />

-    <None Include="res\Radio_on.ico" />

-    <None Include="res\reload.ico" />

-    <None Include="res\reply.ico" />

-    <None Include="res\resize.ico" />

-    <None Include="res\warning.ico" />

-    <None Include="docs\Changelog.txt" />

-    <None Include="res\whatsnew.txt" />

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="resource.rc" />

-    <ResourceCompile Include="version.rc" />

+    <ResourceCompile Include="res\resource.rc" />

+    <ResourceCompile Include="res\version.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/Popup/PopUp_10.vcxproj.filters b/plugins/Popup/PopUp_10.vcxproj.filters
index 1fe3cb9eca..0823317a3f 100644
--- a/plugins/Popup/PopUp_10.vcxproj.filters
+++ b/plugins/Popup/PopUp_10.vcxproj.filters
@@ -9,17 +9,10 @@
       <UniqueIdentifier>{58b87470-6530-4485-8a11-2b34996c3d54}</UniqueIdentifier>

       <Extensions>h;hpp;hxx;hm;inl</Extensions>

     </Filter>

-    <Filter Include="defs">

-      <UniqueIdentifier>{0fd67b29-f530-424d-a3c6-9cff1c322fe9}</UniqueIdentifier>

-    </Filter>

     <Filter Include="Resource Files">

       <UniqueIdentifier>{19999220-077c-4521-b4e8-e28baf26ea12}</UniqueIdentifier>

       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

     </Filter>

-    <Filter Include="docs">

-      <UniqueIdentifier>{2c54b55f-1f99-474e-99ef-34c8f4210772}</UniqueIdentifier>

-      <Extensions>txt</Extensions>

-    </Filter>

     <Filter Include="Option Pages">

       <UniqueIdentifier>{529f787f-6a3b-402b-8451-73ab712c2fd5}</UniqueIdentifier>

     </Filter>

@@ -153,7 +146,7 @@
     <ClInclude Include="src\popup_wnd2.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

+    <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="src\services.h">

@@ -198,116 +191,15 @@
     <ClInclude Include="src\common.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="version.h">

+    <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="res\add.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\avatar.bmp">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\block.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\Check_off.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\Check_on.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\classic.popupskin">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\close.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\error.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\favorite.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\fullscreen.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\img.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\info.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\menu.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\message.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\notify.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\ok.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\pin.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\pinned.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\popup.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\popup_fav.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\popup_fs.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\popup_group.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\popup_history.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\popup_no.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\popup_plus.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\Radio_off.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\Radio_on.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\reload.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\reply.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\resize.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\warning.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="docs\Changelog.txt">

-      <Filter>docs</Filter>

-    </None>

-    <None Include="res\whatsnew.txt">

-      <Filter>docs</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="resource.rc">

+    <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="version.rc">

+    <ResourceCompile Include="res\version.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/Popup/PopUp_10.vcxproj.user b/plugins/Popup/PopUp_10.vcxproj.user
new file mode 100644
index 0000000000..695b5c78b9
--- /dev/null
+++ b/plugins/Popup/PopUp_10.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+</Project>
\ No newline at end of file
diff --git a/plugins/Popup/popup-translation.txt b/plugins/Popup/docs/popup-translation.txt
index e97f268222..e97f268222 100644
--- a/plugins/Popup/popup-translation.txt
+++ b/plugins/Popup/docs/popup-translation.txt
diff --git a/plugins/Popup/res/whatsnew.txt b/plugins/Popup/docs/whatsnew.txt
index 63b0bd2abf..63b0bd2abf 100644
--- a/plugins/Popup/res/whatsnew.txt
+++ b/plugins/Popup/docs/whatsnew.txt
diff --git a/plugins/Popup/res/img.ico b/plugins/Popup/res/img.ico
deleted file mode 100644
index fef70bdd1e..0000000000
--- a/plugins/Popup/res/img.ico
+++ /dev/null
diff --git a/plugins/Popup/res/popup_plus.ico b/plugins/Popup/res/popup_plus.ico
deleted file mode 100644
index 37ddc85035..0000000000
--- a/plugins/Popup/res/popup_plus.ico
+++ /dev/null
diff --git a/plugins/Popup/resource.rc b/plugins/Popup/res/resource.rc
index 0d01beb1d7..6eada48e5d 100644
--- a/plugins/Popup/resource.rc
+++ b/plugins/Popup/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

+#include "..\src\resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -26,34 +26,34 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_POPUP               ICON                    "res\\popup.ico"

-IDI_PU_FULLSCREEN       ICON                    "res\\popup_fs.ico"

-IDI_PU_FAVOURITE        ICON                    "res\\popup_fav.ico"

-IDI_NOPOPUP             ICON                    "res\\popup_no.ico"

-IDI_HISTORY             ICON                    "res\\popup_history.ico"

-IDI_RELOAD              ICON                    "res\\reload.ico"

-IDI_OPT_CHECK_OFF       ICON                    "res\\Check_off.ico"

-IDI_OPT_CHECK_ON        ICON                    "res\\Check_on.ico"

-IDI_OPT_RADIO_OFF       ICON                    "res\\Radio_off.ico"

-IDI_OPT_RADIO_ON        ICON                    "res\\Radio_on.ico"

-IDI_ACT_INFO            ICON                    "res\\info.ico"

-IDI_ACT_MENU            ICON                    "res\\menu.ico"

-IDI_ACT_MESSAGE         ICON                    "res\\message.ico"

-IDI_ACT_OK              ICON                    "res\\ok.ico"

-IDI_ACT_ADD             ICON                    "res\\add.ico"

-IDI_ACT_CLOSE           ICON                    "res\\close.ico"

-IDI_ACT_PINNED          ICON                    "res\\pinned.ico"

-IDI_ACT_PIN             ICON                    "res\\pin.ico"

-IDI_RESIZE              ICON                    "res\\resize.ico"

-IDI_MB_STOP             ICON                    "res\\error.ico"

-IDI_MB_INFO             ICON                    "res\\notify.ico"

-IDI_MB_WARN             ICON                    "res\\warning.ico"

-IDI_OPT_GROUP           ICON                    "res\\popup_group.ico"

-IDI_OPT_FULLSCREEN      ICON                    "res\\fullscreen.ico"

-IDI_OPT_BLOCK           ICON                    "res\\block.ico"

-IDI_OPT_FAVORITE        ICON                    "res\\favorite.ico"

-IDI_ACT_REPLY           ICON                    "res\\reply.ico"

-IDI_ACT_COPY            ICON                    "res\\copy.ico"

+IDI_POPUP               ICON                    "popup.ico"

+IDI_PU_FULLSCREEN       ICON                    "popup_fs.ico"

+IDI_PU_FAVOURITE        ICON                    "popup_fav.ico"

+IDI_NOPOPUP             ICON                    "popup_no.ico"

+IDI_HISTORY             ICON                    "popup_history.ico"

+IDI_RELOAD              ICON                    "reload.ico"

+IDI_OPT_CHECK_OFF       ICON                    "Check_off.ico"

+IDI_OPT_CHECK_ON        ICON                    "Check_on.ico"

+IDI_OPT_RADIO_OFF       ICON                    "Radio_off.ico"

+IDI_OPT_RADIO_ON        ICON                    "Radio_on.ico"

+IDI_ACT_INFO            ICON                    "info.ico"

+IDI_ACT_MENU            ICON                    "menu.ico"

+IDI_ACT_MESSAGE         ICON                    "message.ico"

+IDI_ACT_OK              ICON                    "ok.ico"

+IDI_ACT_ADD             ICON                    "add.ico"

+IDI_ACT_CLOSE           ICON                    "close.ico"

+IDI_ACT_PINNED          ICON                    "pinned.ico"

+IDI_ACT_PIN             ICON                    "pin.ico"

+IDI_RESIZE              ICON                    "resize.ico"

+IDI_MB_STOP             ICON                    "error.ico"

+IDI_MB_INFO             ICON                    "notify.ico"

+IDI_MB_WARN             ICON                    "warning.ico"

+IDI_OPT_GROUP           ICON                    "popup_group.ico"

+IDI_OPT_FULLSCREEN      ICON                    "fullscreen.ico"

+IDI_OPT_BLOCK           ICON                    "block.ico"

+IDI_OPT_FAVORITE        ICON                    "favorite.ico"

+IDI_ACT_REPLY           ICON                    "reply.ico"

+IDI_ACT_COPY            ICON                    "copy.ico"

 

 /////////////////////////////////////////////////////////////////////////////

 //

@@ -341,21 +341,14 @@ END
 // SKIN

 //

 

-CLASSIC.POPUPSKIN       SKIN                    "res\\classic.popupskin"

+CLASSIC.POPUPSKIN       SKIN                    "classic.popupskin"

 

 /////////////////////////////////////////////////////////////////////////////

 //

 // Bitmap

 //

 

-IDB_NOAVATAR            BITMAP                  "res\\avatar.bmp"

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXT

-//

-

-IDR_WHATSNEW            TEXT                    "res\\whatsnew.txt"

+IDB_NOAVATAR            BITMAP                  "avatar.bmp"

 

 /////////////////////////////////////////////////////////////////////////////

 //

@@ -391,7 +384,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

+    "..\\src\\resource.h\0"

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/Popup/version.rc b/plugins/Popup/res/version.rc
index 160afdf230..85065fb60c 100644
--- a/plugins/Popup/version.rc
+++ b/plugins/Popup/res/version.rc
@@ -3,7 +3,7 @@
 #endif //APSTUDIO_INVOKED

 

 #include <windows.h> // include for version info constants

-#include "version.h"

+#include "..\src\version.h"

 

 //

 // TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS...

diff --git a/plugins/Popup/src/headers.h b/plugins/Popup/src/headers.h
index e4eca04876..0b0c32298e 100644
--- a/plugins/Popup/src/headers.h
+++ b/plugins/Popup/src/headers.h
@@ -86,7 +86,7 @@ Last change by : $Author: Merlin_de $
 #endif

 

 	//Resources

-	#include "../resource.h"

+	#include "resource.h"

 

 	#define NOWIN2K

 	#define MIRANDA_VER 0x0A00

@@ -139,7 +139,7 @@ Last change by : $Author: Merlin_de $
 

 	//PopUp common handlers

 	#include "defs.h"

-	#include "../version.h"

+	#include "version.h"

 	#include "config.h"

 	#include "common.h"

 	#include "def_settings.h"

diff --git a/plugins/Popup/resource.h b/plugins/Popup/src/resource.h
index 9585f9e793..9585f9e793 100644
--- a/plugins/Popup/resource.h
+++ b/plugins/Popup/src/resource.h
diff --git a/plugins/Popup/version.h b/plugins/Popup/src/version.h
index b53bb51f65..b53bb51f65 100644
--- a/plugins/Popup/version.h
+++ b/plugins/Popup/src/version.h
diff --git a/plugins/ProfileManager/profilemanager-translation.txt b/plugins/ProfileManager/docs/profilemanager-translation.txt
index 52329c17db..52329c17db 100644
--- a/plugins/ProfileManager/profilemanager-translation.txt
+++ b/plugins/ProfileManager/docs/profilemanager-translation.txt
diff --git a/plugins/ProfileManager/pmanagerEx.vcxproj b/plugins/ProfileManager/pmanagerEx.vcxproj
index cb727ed048..38508aa2eb 100644
--- a/plugins/ProfileManager/pmanagerEx.vcxproj
+++ b/plugins/ProfileManager/pmanagerEx.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;pmanager_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -96,7 +96,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;pmanager_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

@@ -119,7 +119,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;pmanager_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

@@ -144,7 +144,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;pmanager_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

@@ -164,13 +164,13 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="pmanagerEx.cpp" />

+    <ClCompile Include="src\pmanagerEx.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="resource.h" />

+    <ClInclude Include="src\resource.h" />

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc" />

+    <ResourceCompile Include="res\resource.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/ProfileManager/pmanagerEx.vcxproj.filters b/plugins/ProfileManager/pmanagerEx.vcxproj.filters
index 91e07c558e..223e2d2d66 100644
--- a/plugins/ProfileManager/pmanagerEx.vcxproj.filters
+++ b/plugins/ProfileManager/pmanagerEx.vcxproj.filters
@@ -15,17 +15,17 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="pmanagerEx.cpp">

+    <ClCompile Include="src\pmanagerEx.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="resource.h">

+    <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc">

+    <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/ProfileManager/pmanagerEx.vcxproj.user b/plugins/ProfileManager/pmanagerEx.vcxproj.user
new file mode 100644
index 0000000000..695b5c78b9
--- /dev/null
+++ b/plugins/ProfileManager/pmanagerEx.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+</Project>
\ No newline at end of file
diff --git a/plugins/ProfileManager/resource.rc b/plugins/ProfileManager/res/resource.rc
index 92a42063c4..8a81324da1 100644
--- a/plugins/ProfileManager/resource.rc
+++ b/plugins/ProfileManager/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

+#include "..\src\resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -28,8 +28,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_ChangePM               ICON                    "res/ChangePM.ico"

-IDI_LoadPM              ICON                    "res/LoadPM.ico"

+IDI_ChangePM               ICON                    "ChangePM.ico"

+IDI_LoadPM              ICON                    "LoadPM.ico"

 #endif    // Neutral resources

 /////////////////////////////////////////////////////////////////////////////

 

diff --git a/plugins/ProfileManager/pmanagerEx.cpp b/plugins/ProfileManager/src/pmanagerEx.cpp
index be6bfb8c0f..be6bfb8c0f 100644
--- a/plugins/ProfileManager/pmanagerEx.cpp
+++ b/plugins/ProfileManager/src/pmanagerEx.cpp
diff --git a/plugins/ProfileManager/resource.h b/plugins/ProfileManager/src/resource.h
index 638fcfb4f6..638fcfb4f6 100644
--- a/plugins/ProfileManager/resource.h
+++ b/plugins/ProfileManager/src/resource.h