StopSpamPlus, TipperYM, TooltipNotify, TopToolBar, TranslitSwitcher, UserGuide: changed folder structure

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

29 files changed, 68 insertions, 102 deletions

diff --git a/plugins/TipperYM/tipperym-translation.txt b/plugins/TipperYM/docs/tipperym-translation.txt
index f13fb40443..f13fb40443 100644
--- a/plugins/TipperYM/tipperym-translation.txt
+++ b/plugins/TipperYM/docs/tipperym-translation.txt
diff --git a/plugins/TipperYM/resource.rc b/plugins/TipperYM/res/resource.rc
index d289b911ba..8c7a166d71 100644
--- a/plugins/TipperYM/resource.rc
+++ b/plugins/TipperYM/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -326,13 +326,13 @@ END
 

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

 // remains consistent on all systems.

-IDI_ITEM                ICON                    "res\\copy_item.ico"

-IDI_ITEM_ALL            ICON                    "res\\copy_all_items.ico"

-IDI_UP                  ICON                    "res\\arrow_up.ico"

-IDI_DOWN                ICON                    "res\\arrow_down.ico"

-IDI_SEPARATOR           ICON                    "res\\separator.ico"

-IDI_RELOAD              ICON                    "res\\reload.ico"

-IDI_APPLY               ICON                    "res\\apply.ico"

+IDI_ITEM                ICON                    "copy_item.ico"

+IDI_ITEM_ALL            ICON                    "copy_all_items.ico"

+IDI_UP                  ICON                    "arrow_up.ico"

+IDI_DOWN                ICON                    "arrow_down.ico"

+IDI_SEPARATOR           ICON                    "separator.ico"

+IDI_RELOAD              ICON                    "reload.ico"

+IDI_APPLY               ICON                    "apply.ico"

 #endif    // Czech (Czech Republic) resources

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

 

@@ -352,7 +352,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/TipperYM/version.rc b/plugins/TipperYM/res/version.rc
index cb8ea0cd97..724de5240a 100644
--- a/plugins/TipperYM/version.rc
+++ b/plugins/TipperYM/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/TipperYM/bitmap_func.cpp b/plugins/TipperYM/src/bitmap_func.cpp
index 0a33c7b1d8..0a33c7b1d8 100644
--- a/plugins/TipperYM/bitmap_func.cpp
+++ b/plugins/TipperYM/src/bitmap_func.cpp
diff --git a/plugins/TipperYM/bitmap_func.h b/plugins/TipperYM/src/bitmap_func.h
index e6ffbc4880..e6ffbc4880 100644
--- a/plugins/TipperYM/bitmap_func.h
+++ b/plugins/TipperYM/src/bitmap_func.h
diff --git a/plugins/TipperYM/common.h b/plugins/TipperYM/src/common.h
index ab678bac79..9098589d1c 100644
--- a/plugins/TipperYM/common.h
+++ b/plugins/TipperYM/src/common.h
@@ -40,6 +40,8 @@ Boston, MA 02111-1307, USA.
 

 #define MIRANDA_VER		0x0A00

 

+#define _CRT_SECURE_NO_WARNINGS

+

 #include <m_stdhdr.h>

 

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

diff --git a/plugins/TipperYM/message_pump.cpp b/plugins/TipperYM/src/message_pump.cpp
index 7032ad84b2..7032ad84b2 100644
--- a/plugins/TipperYM/message_pump.cpp
+++ b/plugins/TipperYM/src/message_pump.cpp
diff --git a/plugins/TipperYM/message_pump.h b/plugins/TipperYM/src/message_pump.h
index a8858e3865..a8858e3865 100644
--- a/plugins/TipperYM/message_pump.h
+++ b/plugins/TipperYM/src/message_pump.h
diff --git a/plugins/TipperYM/mir_smileys.cpp b/plugins/TipperYM/src/mir_smileys.cpp
index 5af05c4b22..5af05c4b22 100644
--- a/plugins/TipperYM/mir_smileys.cpp
+++ b/plugins/TipperYM/src/mir_smileys.cpp
diff --git a/plugins/TipperYM/mir_smileys.h b/plugins/TipperYM/src/mir_smileys.h
index 5f78ac8f09..5f78ac8f09 100644
--- a/plugins/TipperYM/mir_smileys.h
+++ b/plugins/TipperYM/src/mir_smileys.h
diff --git a/plugins/TipperYM/options.cpp b/plugins/TipperYM/src/options.cpp
index ceb4a223b5..ceb4a223b5 100644
--- a/plugins/TipperYM/options.cpp
+++ b/plugins/TipperYM/src/options.cpp
diff --git a/plugins/TipperYM/options.h b/plugins/TipperYM/src/options.h
index 52411110fb..52411110fb 100644
--- a/plugins/TipperYM/options.h
+++ b/plugins/TipperYM/src/options.h
diff --git a/plugins/TipperYM/popwin.cpp b/plugins/TipperYM/src/popwin.cpp
index 964069ce2d..964069ce2d 100644
--- a/plugins/TipperYM/popwin.cpp
+++ b/plugins/TipperYM/src/popwin.cpp
diff --git a/plugins/TipperYM/popwin.h b/plugins/TipperYM/src/popwin.h
index b7ba674b08..b7ba674b08 100644
--- a/plugins/TipperYM/popwin.h
+++ b/plugins/TipperYM/src/popwin.h
diff --git a/plugins/TipperYM/preset_items.cpp b/plugins/TipperYM/src/preset_items.cpp
index 629a747a28..629a747a28 100644
--- a/plugins/TipperYM/preset_items.cpp
+++ b/plugins/TipperYM/src/preset_items.cpp
diff --git a/plugins/TipperYM/preset_items.h b/plugins/TipperYM/src/preset_items.h
index 5055db3dee..5055db3dee 100644
--- a/plugins/TipperYM/preset_items.h
+++ b/plugins/TipperYM/src/preset_items.h
diff --git a/plugins/TipperYM/resource.h b/plugins/TipperYM/src/resource.h
index 0e850b25ea..0e850b25ea 100644
--- a/plugins/TipperYM/resource.h
+++ b/plugins/TipperYM/src/resource.h
diff --git a/plugins/TipperYM/skin_parser.cpp b/plugins/TipperYM/src/skin_parser.cpp
index 3c851e0039..3c851e0039 100644
--- a/plugins/TipperYM/skin_parser.cpp
+++ b/plugins/TipperYM/src/skin_parser.cpp
diff --git a/plugins/TipperYM/skin_parser.h b/plugins/TipperYM/src/skin_parser.h
index ca83f47915..ca83f47915 100644
--- a/plugins/TipperYM/skin_parser.h
+++ b/plugins/TipperYM/src/skin_parser.h
diff --git a/plugins/TipperYM/str_utils.cpp b/plugins/TipperYM/src/str_utils.cpp
index 112cc2678b..112cc2678b 100644
--- a/plugins/TipperYM/str_utils.cpp
+++ b/plugins/TipperYM/src/str_utils.cpp
diff --git a/plugins/TipperYM/str_utils.h b/plugins/TipperYM/src/str_utils.h
index 26fbb613fa..26fbb613fa 100644
--- a/plugins/TipperYM/str_utils.h
+++ b/plugins/TipperYM/src/str_utils.h
diff --git a/plugins/TipperYM/subst.cpp b/plugins/TipperYM/src/subst.cpp
index 1d8c8837d9..1d8c8837d9 100644
--- a/plugins/TipperYM/subst.cpp
+++ b/plugins/TipperYM/src/subst.cpp
diff --git a/plugins/TipperYM/subst.h b/plugins/TipperYM/src/subst.h
index 41f66f871a..41f66f871a 100644
--- a/plugins/TipperYM/subst.h
+++ b/plugins/TipperYM/src/subst.h
diff --git a/plugins/TipperYM/tipper.cpp b/plugins/TipperYM/src/tipper.cpp
index 8c0f5575de..8c0f5575de 100644
--- a/plugins/TipperYM/tipper.cpp
+++ b/plugins/TipperYM/src/tipper.cpp
diff --git a/plugins/TipperYM/translations.cpp b/plugins/TipperYM/src/translations.cpp
index 1fd6e67c39..1fd6e67c39 100644
--- a/plugins/TipperYM/translations.cpp
+++ b/plugins/TipperYM/src/translations.cpp
diff --git a/plugins/TipperYM/translations.h b/plugins/TipperYM/src/translations.h
index 985920054e..985920054e 100644
--- a/plugins/TipperYM/translations.h
+++ b/plugins/TipperYM/src/translations.h
diff --git a/plugins/TipperYM/version.h b/plugins/TipperYM/src/version.h
index c71b187bc0..c71b187bc0 100644
--- a/plugins/TipperYM/version.h
+++ b/plugins/TipperYM/src/version.h
diff --git a/plugins/TipperYM/tipper_ym_10.vcxproj b/plugins/TipperYM/tipper_ym_10.vcxproj
index 9f1780e597..4cea23b995 100644
--- a/plugins/TipperYM/tipper_ym_10.vcxproj
+++ b/plugins/TipperYM/tipper_ym_10.vcxproj
@@ -73,14 +73,13 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <WarningLevel>Level3</WarningLevel>

     </ClCompile>

     <Link>

@@ -100,14 +99,13 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <Link>

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

@@ -130,11 +128,10 @@
       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <WarningLevel>Level3</WarningLevel>

     </ClCompile>

     <Link>

@@ -157,12 +154,11 @@
       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <Link>

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

@@ -180,47 +176,38 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

-    <ClCompile Include="tipper.cpp">

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

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

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

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

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

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

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

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

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

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

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

-  </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/TipperYM/tipper_ym_10.vcxproj.filters b/plugins/TipperYM/tipper_ym_10.vcxproj.filters
index 508c94cb08..9cd122d83e 100644
--- a/plugins/TipperYM/tipper_ym_10.vcxproj.filters
+++ b/plugins/TipperYM/tipper_ym_10.vcxproj.filters
@@ -15,109 +15,86 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="bitmap_func.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="message_pump.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="mir_smileys.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="popwin.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="preset_items.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="skin_parser.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="str_utils.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="subst.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="tipper.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="translations.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="bitmap_func.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="common.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="message_pump.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="mir_smileys.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="options.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="popwin.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="preset_items.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="skin_parser.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="str_utils.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="subst.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="translations.h">

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</Filter>

-    </None>

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

-      <Filter>Resource Files</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>