Import, KeyboardNotify: changed folder structure

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

24 files changed, 51 insertions, 55 deletions

diff --git a/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj b/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj
index 9b64f36c80..8e39f9709e 100644
--- a/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj
+++ b/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj
@@ -73,11 +73,10 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -96,10 +95,9 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>

     </ClCompile>

     <Link>

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

@@ -119,9 +117,8 @@
       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>

     </ClCompile>

     <Link>

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

@@ -143,9 +140,8 @@
       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>

     </ClCompile>

     <Link>

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

@@ -163,31 +159,31 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj.filters b/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj.filters
index 35c9d4b195..8fe859e1ea 100644
--- a/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj.filters
+++ b/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj.filters
@@ -12,71 +12,71 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="AggressiveOptimize.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="constants.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="EnumProc.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="flash.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="ignore.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="keyboard.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="keypresses.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="protolist.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="trigger.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="utils.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="EnumProc.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="utils.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="flash.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="ignore.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="keyboard.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="keypresses.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="trigger.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resources.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/KeyboardNotify/keyboardnotify-translation.txt b/plugins/KeyboardNotify/docs/keyboardnotify-translation.txt
index f73628491f..f73628491f 100644
--- a/plugins/KeyboardNotify/keyboardnotify-translation.txt
+++ b/plugins/KeyboardNotify/docs/keyboardnotify-translation.txt
diff --git a/plugins/KeyboardNotify/resources.rc b/plugins/KeyboardNotify/res/resources.rc
index 7bbf535460..f63ee9d214 100644
--- a/plugins/KeyboardNotify/resources.rc
+++ b/plugins/KeyboardNotify/res/resources.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -388,18 +388,18 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN
 // TEXTINCLUDE

 //

 

-1 TEXTINCLUDE DISCARDABLE 

+1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

-2 TEXTINCLUDE DISCARDABLE 

+2 TEXTINCLUDE 

 BEGIN

     "#include ""afxres.h""\r\n"

     "\0"

 END

 

-3 TEXTINCLUDE DISCARDABLE 

+3 TEXTINCLUDE 

 BEGIN

     "\r\n"

     "\0"

diff --git a/plugins/KeyboardNotify/AggressiveOptimize.h b/plugins/KeyboardNotify/src/AggressiveOptimize.h
index 34c6074320..34c6074320 100644
--- a/plugins/KeyboardNotify/AggressiveOptimize.h
+++ b/plugins/KeyboardNotify/src/AggressiveOptimize.h
diff --git a/plugins/KeyboardNotify/EnumProc.cpp b/plugins/KeyboardNotify/src/EnumProc.cpp
index 7a5a23f0e3..7a5a23f0e3 100644
--- a/plugins/KeyboardNotify/EnumProc.cpp
+++ b/plugins/KeyboardNotify/src/EnumProc.cpp
diff --git a/plugins/KeyboardNotify/EnumProc.h b/plugins/KeyboardNotify/src/EnumProc.h
index 09b3cba8d6..09b3cba8d6 100644
--- a/plugins/KeyboardNotify/EnumProc.h
+++ b/plugins/KeyboardNotify/src/EnumProc.h
diff --git a/plugins/KeyboardNotify/constants.h b/plugins/KeyboardNotify/src/constants.h
index d50ded6d23..d50ded6d23 100644
--- a/plugins/KeyboardNotify/constants.h
+++ b/plugins/KeyboardNotify/src/constants.h
diff --git a/plugins/KeyboardNotify/flash.cpp b/plugins/KeyboardNotify/src/flash.cpp
index aa0014a329..aa0014a329 100644
--- a/plugins/KeyboardNotify/flash.cpp
+++ b/plugins/KeyboardNotify/src/flash.cpp
diff --git a/plugins/KeyboardNotify/flash.h b/plugins/KeyboardNotify/src/flash.h
index f60706fc76..f60706fc76 100644
--- a/plugins/KeyboardNotify/flash.h
+++ b/plugins/KeyboardNotify/src/flash.h
diff --git a/plugins/KeyboardNotify/ignore.cpp b/plugins/KeyboardNotify/src/ignore.cpp
index 57fcceb8a6..57fcceb8a6 100644
--- a/plugins/KeyboardNotify/ignore.cpp
+++ b/plugins/KeyboardNotify/src/ignore.cpp
diff --git a/plugins/KeyboardNotify/ignore.h b/plugins/KeyboardNotify/src/ignore.h
index a72df7b6f6..a72df7b6f6 100644
--- a/plugins/KeyboardNotify/ignore.h
+++ b/plugins/KeyboardNotify/src/ignore.h
diff --git a/plugins/KeyboardNotify/keyboard.cpp b/plugins/KeyboardNotify/src/keyboard.cpp
index df1033fce7..df1033fce7 100644
--- a/plugins/KeyboardNotify/keyboard.cpp
+++ b/plugins/KeyboardNotify/src/keyboard.cpp
diff --git a/plugins/KeyboardNotify/keyboard.h b/plugins/KeyboardNotify/src/keyboard.h
index 8fe6b52fe9..8fe6b52fe9 100644
--- a/plugins/KeyboardNotify/keyboard.h
+++ b/plugins/KeyboardNotify/src/keyboard.h
diff --git a/plugins/KeyboardNotify/keypresses.cpp b/plugins/KeyboardNotify/src/keypresses.cpp
index 6d1cef58e6..6d1cef58e6 100644
--- a/plugins/KeyboardNotify/keypresses.cpp
+++ b/plugins/KeyboardNotify/src/keypresses.cpp
diff --git a/plugins/KeyboardNotify/keypresses.h b/plugins/KeyboardNotify/src/keypresses.h
index 57e99aa25c..57e99aa25c 100644
--- a/plugins/KeyboardNotify/keypresses.h
+++ b/plugins/KeyboardNotify/src/keypresses.h
diff --git a/plugins/KeyboardNotify/main.cpp b/plugins/KeyboardNotify/src/main.cpp
index e82cc2cfdc..e82cc2cfdc 100644
--- a/plugins/KeyboardNotify/main.cpp
+++ b/plugins/KeyboardNotify/src/main.cpp
diff --git a/plugins/KeyboardNotify/options.cpp b/plugins/KeyboardNotify/src/options.cpp
index d74902aec8..d74902aec8 100644
--- a/plugins/KeyboardNotify/options.cpp
+++ b/plugins/KeyboardNotify/src/options.cpp
diff --git a/plugins/KeyboardNotify/protolist.h b/plugins/KeyboardNotify/src/protolist.h
index 5a08d929da..5a08d929da 100644
--- a/plugins/KeyboardNotify/protolist.h
+++ b/plugins/KeyboardNotify/src/protolist.h
diff --git a/plugins/KeyboardNotify/resource.h b/plugins/KeyboardNotify/src/resource.h
index 4ebfb19cd0..4ebfb19cd0 100644
--- a/plugins/KeyboardNotify/resource.h
+++ b/plugins/KeyboardNotify/src/resource.h
diff --git a/plugins/KeyboardNotify/trigger.cpp b/plugins/KeyboardNotify/src/trigger.cpp
index df3d7daaf3..df3d7daaf3 100644
--- a/plugins/KeyboardNotify/trigger.cpp
+++ b/plugins/KeyboardNotify/src/trigger.cpp
diff --git a/plugins/KeyboardNotify/trigger.h b/plugins/KeyboardNotify/src/trigger.h
index 41d830938c..41d830938c 100644
--- a/plugins/KeyboardNotify/trigger.h
+++ b/plugins/KeyboardNotify/src/trigger.h
diff --git a/plugins/KeyboardNotify/utils.cpp b/plugins/KeyboardNotify/src/utils.cpp
index 9c710ba217..9c710ba217 100644
--- a/plugins/KeyboardNotify/utils.cpp
+++ b/plugins/KeyboardNotify/src/utils.cpp
diff --git a/plugins/KeyboardNotify/utils.h b/plugins/KeyboardNotify/src/utils.h
index 66917754ed..66917754ed 100644
--- a/plugins/KeyboardNotify/utils.h
+++ b/plugins/KeyboardNotify/src/utils.h