ExtraIcon, Favcontacts, FileAsMessage, FingerPrintModPlus: changed folder structure

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

25 files changed, 52 insertions, 105 deletions

diff --git a/plugins/ExtraIcons/extraicons-translation.txt b/plugins/ExtraIcons/Docs/extraicons-translation.txt
index e0d747baa0..e0d747baa0 100644
--- a/plugins/ExtraIcons/extraicons-translation.txt
+++ b/plugins/ExtraIcons/Docs/extraicons-translation.txt
diff --git a/plugins/ExtraIcons/extraicons.vcxproj b/plugins/ExtraIcons/extraicons.vcxproj
index 2977307d90..eb438635ba 100644
--- a/plugins/ExtraIcons/extraicons.vcxproj
+++ b/plugins/ExtraIcons/extraicons.vcxproj
@@ -86,7 +86,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalOptions>/ALIGN:4096 /filealign:0x200 /ignore:4108  %(AdditionalOptions)</AdditionalOptions>

       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -115,7 +114,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalOptions>/ALIGN:4096 /filealign:0x200 /ignore:4108  %(AdditionalOptions)</AdditionalOptions>

       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -143,7 +141,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalOptions>/ALIGN:4096 /filealign:0x200 /ignore:4108  %(AdditionalOptions)</AdditionalOptions>

       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3EC20000</BaseAddress>

@@ -168,7 +165,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalOptions>/ALIGN:4096 /filealign:0x200 /ignore:4108  %(AdditionalOptions)</AdditionalOptions>

       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3EC20000</BaseAddress>

@@ -179,50 +175,38 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

     <ClInclude Include="..\utils\mir_icons.h" />

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

-  </ItemGroup>

-  <ItemGroup>

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

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

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

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

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

-    <ClCompile Include="extraicons.cpp">

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

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

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

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

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

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

     <ClCompile Include="..\utils\mir_icons.cpp">

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

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

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

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/ExtraIcons/extraicons.vcxproj.filters b/plugins/ExtraIcons/extraicons.vcxproj.filters
index 3e4577b99b..1956c406eb 100644
--- a/plugins/ExtraIcons/extraicons.vcxproj.filters
+++ b/plugins/ExtraIcons/extraicons.vcxproj.filters
@@ -13,117 +13,82 @@
       <UniqueIdentifier>{d6b93e43-b221-4629-bb6e-19f9fa9373a0}</UniqueIdentifier>

       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

     </Filter>

-    <Filter Include="Docs">

-      <UniqueIdentifier>{d7ab53c3-5a13-4c10-bd27-60f5549a39cd}</UniqueIdentifier>

-    </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="BaseExtraIcon.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="CallbackExtraIcon.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="commons.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="DefaultExtraIcons.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="ExtraIcon.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="ExtraIconGroup.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="IcolibExtraIcon.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="..\utils\mir_icons.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="options.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="usedIcons.h">

+    <ClInclude Include="src\usedIcons.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\AlwaysVis.ico">

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Docs</Filter>

-    </None>

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

-      <Filter>Docs</Filter>

-    </None>

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

-      <Filter>Docs</Filter>

-    </None>

-    <None Include="Docs\langpack_extraicons.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>

   <ItemGroup>

-    <ClCompile Include="BaseExtraIcon.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="CallbackExtraIcon.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="DefaultExtraIcons.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="ExtraIcon.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="ExtraIconGroup.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="extraicons.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="IcolibExtraIcon.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="..\utils\mir_icons.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="usedIcons.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

diff --git a/plugins/ExtraIcons/Version.rc b/plugins/ExtraIcons/res/Version.rc
index d1da5e8d6a..d741488c4f 100644
--- a/plugins/ExtraIcons/Version.rc
+++ b/plugins/ExtraIcons/res/Version.rc
@@ -5,7 +5,7 @@
 #endif //APSTUDIO_INVOKED

 

 #include "afxres.h"

-#include "version.h"

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

 

 #ifdef _WIN32

 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

diff --git a/plugins/ExtraIcons/resource.rc b/plugins/ExtraIcons/res/resource.rc
index 22cbf020df..110c265871 100644
--- a/plugins/ExtraIcons/resource.rc
+++ b/plugins/ExtraIcons/res/resource.rc
@@ -1,13 +1,11 @@
 //Microsoft Developer Studio generated resource script.

 //

-#include "resource.h"

-

 #define APSTUDIO_READONLY_SYMBOLS

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

 //

 // Generated from the TEXTINCLUDE 2 resource.

 //

-#include "resource.h"

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

 #include "winresrc.h"

 

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

@@ -70,12 +68,12 @@ END
 

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

 // remains consistent on all systems.

-IDI_ALWAYSVIS           ICON    DISCARDABLE     "res\\AlwaysVis.ico"

-IDI_NEVERVIS            ICON    DISCARDABLE     "res\\NeverVis.ico"

-IDI_CHAT                ICON    DISCARDABLE     "res\\Chatchannel.ico"

-IDI_MALE                ICON    DISCARDABLE     "res\\male.ico"

-IDI_FEMALE              ICON    DISCARDABLE     "res\\female.ico"

-IDI_EMPTY               ICON    DISCARDABLE     "res\\empty.ico"

+IDI_ALWAYSVIS           ICON     "AlwaysVis.ico"

+IDI_NEVERVIS            ICON     "NeverVis.ico"

+IDI_CHAT                ICON     "Chatchannel.ico"

+IDI_MALE                ICON     "male.ico"

+IDI_FEMALE              ICON     "female.ico"

+IDI_EMPTY               ICON     "empty.ico"

 

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

 //

diff --git a/plugins/ExtraIcons/BaseExtraIcon.cpp b/plugins/ExtraIcons/src/BaseExtraIcon.cpp
index f1aea5438c..f1aea5438c 100644
--- a/plugins/ExtraIcons/BaseExtraIcon.cpp
+++ b/plugins/ExtraIcons/src/BaseExtraIcon.cpp
diff --git a/plugins/ExtraIcons/BaseExtraIcon.h b/plugins/ExtraIcons/src/BaseExtraIcon.h
index e484dd2e4b..e484dd2e4b 100644
--- a/plugins/ExtraIcons/BaseExtraIcon.h
+++ b/plugins/ExtraIcons/src/BaseExtraIcon.h
diff --git a/plugins/ExtraIcons/CallbackExtraIcon.cpp b/plugins/ExtraIcons/src/CallbackExtraIcon.cpp
index 3f4d368f75..3f4d368f75 100644
--- a/plugins/ExtraIcons/CallbackExtraIcon.cpp
+++ b/plugins/ExtraIcons/src/CallbackExtraIcon.cpp
diff --git a/plugins/ExtraIcons/CallbackExtraIcon.h b/plugins/ExtraIcons/src/CallbackExtraIcon.h
index 7b46c88da9..7b46c88da9 100644
--- a/plugins/ExtraIcons/CallbackExtraIcon.h
+++ b/plugins/ExtraIcons/src/CallbackExtraIcon.h
diff --git a/plugins/ExtraIcons/DefaultExtraIcons.cpp b/plugins/ExtraIcons/src/DefaultExtraIcons.cpp
index 8839aa64ae..8839aa64ae 100644
--- a/plugins/ExtraIcons/DefaultExtraIcons.cpp
+++ b/plugins/ExtraIcons/src/DefaultExtraIcons.cpp
diff --git a/plugins/ExtraIcons/DefaultExtraIcons.h b/plugins/ExtraIcons/src/DefaultExtraIcons.h
index fba4602d41..fba4602d41 100644
--- a/plugins/ExtraIcons/DefaultExtraIcons.h
+++ b/plugins/ExtraIcons/src/DefaultExtraIcons.h
diff --git a/plugins/ExtraIcons/ExtraIcon.cpp b/plugins/ExtraIcons/src/ExtraIcon.cpp
index 1aaab01e2a..1aaab01e2a 100644
--- a/plugins/ExtraIcons/ExtraIcon.cpp
+++ b/plugins/ExtraIcons/src/ExtraIcon.cpp
diff --git a/plugins/ExtraIcons/ExtraIcon.h b/plugins/ExtraIcons/src/ExtraIcon.h
index 03b0177a08..03b0177a08 100644
--- a/plugins/ExtraIcons/ExtraIcon.h
+++ b/plugins/ExtraIcons/src/ExtraIcon.h
diff --git a/plugins/ExtraIcons/ExtraIconGroup.cpp b/plugins/ExtraIcons/src/ExtraIconGroup.cpp
index e5d785008a..e5d785008a 100644
--- a/plugins/ExtraIcons/ExtraIconGroup.cpp
+++ b/plugins/ExtraIcons/src/ExtraIconGroup.cpp
diff --git a/plugins/ExtraIcons/ExtraIconGroup.h b/plugins/ExtraIcons/src/ExtraIconGroup.h
index 906509962d..906509962d 100644
--- a/plugins/ExtraIcons/ExtraIconGroup.h
+++ b/plugins/ExtraIcons/src/ExtraIconGroup.h
diff --git a/plugins/ExtraIcons/IcolibExtraIcon.cpp b/plugins/ExtraIcons/src/IcolibExtraIcon.cpp
index f7dc03ca24..f7dc03ca24 100644
--- a/plugins/ExtraIcons/IcolibExtraIcon.cpp
+++ b/plugins/ExtraIcons/src/IcolibExtraIcon.cpp
diff --git a/plugins/ExtraIcons/IcolibExtraIcon.h b/plugins/ExtraIcons/src/IcolibExtraIcon.h
index 2f142f2607..2f142f2607 100644
--- a/plugins/ExtraIcons/IcolibExtraIcon.h
+++ b/plugins/ExtraIcons/src/IcolibExtraIcon.h
diff --git a/plugins/ExtraIcons/Version.h b/plugins/ExtraIcons/src/Version.h
index c14746132e..c14746132e 100644
--- a/plugins/ExtraIcons/Version.h
+++ b/plugins/ExtraIcons/src/Version.h
diff --git a/plugins/ExtraIcons/commons.h b/plugins/ExtraIcons/src/commons.h
index d52f4bad21..d52f4bad21 100644
--- a/plugins/ExtraIcons/commons.h
+++ b/plugins/ExtraIcons/src/commons.h
diff --git a/plugins/ExtraIcons/extraicons.cpp b/plugins/ExtraIcons/src/extraicons.cpp
index e468137300..e468137300 100644
--- a/plugins/ExtraIcons/extraicons.cpp
+++ b/plugins/ExtraIcons/src/extraicons.cpp
diff --git a/plugins/ExtraIcons/options.cpp b/plugins/ExtraIcons/src/options.cpp
index 8308ac444c..8308ac444c 100644
--- a/plugins/ExtraIcons/options.cpp
+++ b/plugins/ExtraIcons/src/options.cpp
diff --git a/plugins/ExtraIcons/options.h b/plugins/ExtraIcons/src/options.h
index 5d50348c0e..5d50348c0e 100644
--- a/plugins/ExtraIcons/options.h
+++ b/plugins/ExtraIcons/src/options.h
diff --git a/plugins/ExtraIcons/resource.h b/plugins/ExtraIcons/src/resource.h
index 42525157f8..42525157f8 100644
--- a/plugins/ExtraIcons/resource.h
+++ b/plugins/ExtraIcons/src/resource.h
diff --git a/plugins/ExtraIcons/usedIcons.cpp b/plugins/ExtraIcons/src/usedIcons.cpp
index de58069293..de58069293 100644
--- a/plugins/ExtraIcons/usedIcons.cpp
+++ b/plugins/ExtraIcons/src/usedIcons.cpp
diff --git a/plugins/ExtraIcons/usedIcons.h b/plugins/ExtraIcons/src/usedIcons.h
index ef3a0f0200..ef3a0f0200 100644
--- a/plugins/ExtraIcons/usedIcons.h
+++ b/plugins/ExtraIcons/src/usedIcons.h