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

8 files changed, 19 insertions, 23 deletions

diff --git a/plugins/TranslitSwitcher/translitswitcher-translation.txt b/plugins/TranslitSwitcher/Docs/translitswitcher-translation.txt
index a505626cde..a505626cde 100644
--- a/plugins/TranslitSwitcher/translitswitcher-translation.txt
+++ b/plugins/TranslitSwitcher/Docs/translitswitcher-translation.txt
diff --git a/plugins/TranslitSwitcher/Resource.rc b/plugins/TranslitSwitcher/Res/Resource.rc
index b405fa8e86..3019bbb1f4 100644
--- a/plugins/TranslitSwitcher/Resource.rc
+++ b/plugins/TranslitSwitcher/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,9 +26,9 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 

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

 // remains consistent on all systems.

-IDI_SWITCHSEND          ICON                    "res/SwitchSend.ico"

-IDI_TRANSLITSEND        ICON                    "res/TranslitSend.ico"

-IDI_INVERTSEND          ICON                    "res/InvertSend.ico"

+IDI_SWITCHSEND          ICON                    "SwitchSend.ico"

+IDI_TRANSLITSEND        ICON                    "TranslitSend.ico"

+IDI_INVERTSEND          ICON                    "InvertSend.ico"

 

 

 #endif    // Русский (Россия) resources

diff --git a/plugins/TranslitSwitcher/Version.rc b/plugins/TranslitSwitcher/Res/Version.rc
index f331bd1100..472bfbfe38 100644
--- a/plugins/TranslitSwitcher/Version.rc
+++ b/plugins/TranslitSwitcher/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/TranslitSwitcher/Resource.h b/plugins/TranslitSwitcher/Src/Resource.h
index b98a6590c2..b98a6590c2 100644
--- a/plugins/TranslitSwitcher/Resource.h
+++ b/plugins/TranslitSwitcher/Src/Resource.h
diff --git a/plugins/TranslitSwitcher/Src/TranslitSwitcher.h b/plugins/TranslitSwitcher/Src/TranslitSwitcher.h
index 540a0cd1bd..ea29c2c7bf 100644
--- a/plugins/TranslitSwitcher/Src/TranslitSwitcher.h
+++ b/plugins/TranslitSwitcher/Src/TranslitSwitcher.h
@@ -38,8 +38,8 @@ Boston, MA 02111-1307, USA.
 #include "m_msg_buttonsbar.h"

 #include "m_popup.h"

 

-#include "..\version.h"

-#include "..\resource.h"

+#include "version.h"

+#include "resource.h"

 #include "m_smileyadd.h"

 #include "m_ieview.h"

 #include "m_popup2.h"

diff --git a/plugins/TranslitSwitcher/Version.h b/plugins/TranslitSwitcher/Src/Version.h
index c186a42101..c186a42101 100644
--- a/plugins/TranslitSwitcher/Version.h
+++ b/plugins/TranslitSwitcher/Src/Version.h
diff --git a/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj b/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj
index 3a775cda5c..905ac38d84 100644
--- a/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj
+++ b/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj
@@ -73,13 +73,12 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -97,11 +96,10 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -121,13 +119,12 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <StringPooling>true</StringPooling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <FloatingPointModel>Fast</FloatingPointModel>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -149,13 +146,12 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <StringPooling>true</StringPooling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <FloatingPointModel>Fast</FloatingPointModel>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -172,17 +168,17 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

+    <ClInclude Include="Src\Resource.h" />

     <ClInclude Include="Src\TranslitSwitcher.h" />

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

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

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="Src\Layoutproc.cpp" />

     <ClCompile Include="Src\TranslitSwitcher.cpp" />

   </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/TranslitSwitcher/TranslitSwitcher_10.vcxproj.filters b/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj.filters
index 409eda7983..4b7b7aa2a6 100644
--- a/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj.filters
+++ b/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj.filters
@@ -15,13 +15,13 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="Version.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="Src\TranslitSwitcher.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="Resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

@@ -34,10 +34,10 @@
     </ClCompile>

   </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>