ExtraIcon, Favcontacts, FileAsMessage, FingerPrintModPlus: changed folder structure

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

8 files changed, 11 insertions, 24 deletions

diff --git a/plugins/FavContacts/favcontacts-translation.txt b/plugins/FavContacts/docs/favcontacts-translation.txt
index eb2da986ca..eb2da986ca 100644
--- a/plugins/FavContacts/favcontacts-translation.txt
+++ b/plugins/FavContacts/docs/favcontacts-translation.txt
diff --git a/plugins/FavContacts/favcontacts.vcxproj b/plugins/FavContacts/favcontacts.vcxproj
index 774d61b9d4..72c5c5ed22 100644
--- a/plugins/FavContacts/favcontacts.vcxproj
+++ b/plugins/FavContacts/favcontacts.vcxproj
@@ -89,7 +89,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

@@ -99,7 +99,6 @@
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

     </ClCompile>

     <Link>

@@ -111,7 +110,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

@@ -135,7 +134,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <PreprocessorDefinitions>_UNICODE;UNICODE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

@@ -159,7 +158,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <PreprocessorDefinitions>_UNICODE;UNICODE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

@@ -181,11 +180,7 @@
     <ClInclude Include="src\http_api.h" />

   </ItemGroup>

   <ItemGroup>

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

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

-  </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/FavContacts/favcontacts.vcxproj.filters b/plugins/FavContacts/favcontacts.vcxproj.filters
index 81cec32c10..e11d680945 100644
--- a/plugins/FavContacts/favcontacts.vcxproj.filters
+++ b/plugins/FavContacts/favcontacts.vcxproj.filters
@@ -47,7 +47,7 @@
     <ClInclude Include="src\headers.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

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

@@ -61,15 +61,7 @@
     </ClInclude>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="resource.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/FavContacts/res/favlist.ico b/plugins/FavContacts/res/favlist.ico
deleted file mode 100644
index 9b55cd0afa..0000000000
--- a/plugins/FavContacts/res/favlist.ico
+++ /dev/null
diff --git a/plugins/FavContacts/resource.rc b/plugins/FavContacts/res/resource.rc
index 1aa618c55d..a564cf90b7 100644
--- a/plugins/FavContacts/resource.rc
+++ b/plugins/FavContacts/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_FAVOURITE           ICON                    "res\\favorite.ico"

-IDI_REGULAR             ICON                    "res\\regular.ico"

+IDI_FAVOURITE           ICON                    "favorite.ico"

+IDI_REGULAR             ICON                    "regular.ico"

 

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

 //

diff --git a/plugins/FavContacts/res/userprefs.ico b/plugins/FavContacts/res/userprefs.ico
deleted file mode 100644
index 7028f10d03..0000000000
--- a/plugins/FavContacts/res/userprefs.ico
+++ /dev/null
diff --git a/plugins/FavContacts/src/headers.h b/plugins/FavContacts/src/headers.h
index 5e9771fd6e..12d91e847d 100644
--- a/plugins/FavContacts/src/headers.h
+++ b/plugins/FavContacts/src/headers.h
@@ -56,7 +56,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_fontservice.h>

 #include <m_hotkeys.h>

 

-#include "../resource.h"

+#include "resource.h"

 

 struct Options

 {

diff --git a/plugins/FavContacts/resource.h b/plugins/FavContacts/src/resource.h
index 9466fd8859..9466fd8859 100644
--- a/plugins/FavContacts/resource.h
+++ b/plugins/FavContacts/src/resource.h