HistorySweeperLight, MyDetails, NewEventNotify: changed folder structure

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

37 files changed, 78 insertions, 97 deletions

diff --git a/plugins/HistorySweeperLight/historysweeperlight-translation.txt b/plugins/HistorySweeperLight/docs/historysweeperlight-translation.txt
index 5601d12f3b..5601d12f3b 100644
--- a/plugins/HistorySweeperLight/historysweeperlight-translation.txt
+++ b/plugins/HistorySweeperLight/docs/historysweeperlight-translation.txt
diff --git a/plugins/HistorySweeperLight/historysweeperlight_10.vcxproj b/plugins/HistorySweeperLight/historysweeperlight_10.vcxproj
index 8e14d01bf3..4025de2343 100644
--- a/plugins/HistorySweeperLight/historysweeperlight_10.vcxproj
+++ b/plugins/HistorySweeperLight/historysweeperlight_10.vcxproj
@@ -72,13 +72,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;HISTORYSWEEPERLIGHT_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)</DisableSpecificWarnings>

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

     </ClCompile>

     <Link>

@@ -97,11 +96,10 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

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

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

     </ClCompile>

     <Link>

@@ -123,11 +121,10 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <IntrinsicFunctions>false</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

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

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

     </ClCompile>

     <Link>

@@ -151,11 +148,10 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <IntrinsicFunctions>false</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

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

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

     </ClCompile>

     <Link>

@@ -174,17 +170,17 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/HistorySweeperLight/historysweeperlight_10.vcxproj.filters b/plugins/HistorySweeperLight/historysweeperlight_10.vcxproj.filters
index 215f46c7f5..8e33f1e2f8 100644
--- a/plugins/HistorySweeperLight/historysweeperlight_10.vcxproj.filters
+++ b/plugins/HistorySweeperLight/historysweeperlight_10.vcxproj.filters
@@ -15,29 +15,29 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="historysweeperlight.cpp">

+    <ClCompile Include="src\historysweeperlight.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>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="historysweeperlight.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="version.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="historysweeperlight.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/HistorySweeperLight/act1.ico b/plugins/HistorySweeperLight/res/act1.ico
index 0557c177a1..0557c177a1 100644
--- a/plugins/HistorySweeperLight/act1.ico
+++ b/plugins/HistorySweeperLight/res/act1.ico
diff --git a/plugins/HistorySweeperLight/act2.ico b/plugins/HistorySweeperLight/res/act2.ico
index 957572de2b..957572de2b 100644
--- a/plugins/HistorySweeperLight/act2.ico
+++ b/plugins/HistorySweeperLight/res/act2.ico
diff --git a/plugins/HistorySweeperLight/actDel.ico b/plugins/HistorySweeperLight/res/actDel.ico
index 748ab4b65e..748ab4b65e 100644
--- a/plugins/HistorySweeperLight/actDel.ico
+++ b/plugins/HistorySweeperLight/res/actDel.ico
diff --git a/plugins/HistorySweeperLight/actG.ico b/plugins/HistorySweeperLight/res/actG.ico
index 1273d332ae..1273d332ae 100644
--- a/plugins/HistorySweeperLight/actG.ico
+++ b/plugins/HistorySweeperLight/res/actG.ico
diff --git a/plugins/HistorySweeperLight/historysweeperlight.rc b/plugins/HistorySweeperLight/res/historysweeperlight.rc
index 31129587ca..e322d6468e 100644
--- a/plugins/HistorySweeperLight/historysweeperlight.rc
+++ b/plugins/HistorySweeperLight/res/historysweeperlight.rc
@@ -3,8 +3,8 @@
 // http://www.resedit.net

 

 #include <windows.h>

-#include "resource.h"

-#include "version.h"

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

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

 

 

 

diff --git a/plugins/HistorySweeperLight/historysweeperlight.cpp b/plugins/HistorySweeperLight/src/historysweeperlight.cpp
index 50e37ddc34..50e37ddc34 100644
--- a/plugins/HistorySweeperLight/historysweeperlight.cpp
+++ b/plugins/HistorySweeperLight/src/historysweeperlight.cpp
diff --git a/plugins/HistorySweeperLight/historysweeperlight.h b/plugins/HistorySweeperLight/src/historysweeperlight.h
index c7fbeaeb25..c7fbeaeb25 100644
--- a/plugins/HistorySweeperLight/historysweeperlight.h
+++ b/plugins/HistorySweeperLight/src/historysweeperlight.h
diff --git a/plugins/HistorySweeperLight/main.cpp b/plugins/HistorySweeperLight/src/main.cpp
index c6f8b427ac..c6f8b427ac 100644
--- a/plugins/HistorySweeperLight/main.cpp
+++ b/plugins/HistorySweeperLight/src/main.cpp
diff --git a/plugins/HistorySweeperLight/options.cpp b/plugins/HistorySweeperLight/src/options.cpp
index 2963f8bb2b..2963f8bb2b 100644
--- a/plugins/HistorySweeperLight/options.cpp
+++ b/plugins/HistorySweeperLight/src/options.cpp
diff --git a/plugins/HistorySweeperLight/resource.h b/plugins/HistorySweeperLight/src/resource.h
index bfa91d1d4e..bfa91d1d4e 100644
--- a/plugins/HistorySweeperLight/resource.h
+++ b/plugins/HistorySweeperLight/src/resource.h
diff --git a/plugins/HistorySweeperLight/version.h b/plugins/HistorySweeperLight/src/version.h
index 245200a539..245200a539 100644
--- a/plugins/HistorySweeperLight/version.h
+++ b/plugins/HistorySweeperLight/src/version.h
diff --git a/plugins/MyDetails/mydetails.vcxproj b/plugins/MyDetails/mydetails.vcxproj
index 6c317ba7d9..bc0613622c 100644
--- a/plugins/MyDetails/mydetails.vcxproj
+++ b/plugins/MyDetails/mydetails.vcxproj
@@ -75,7 +75,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -95,7 +95,7 @@
     </Link>

     <ResourceCompile>

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

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

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

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -104,7 +104,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -124,14 +124,14 @@
     </Link>

     <ResourceCompile>

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

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

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

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <BufferSecurityCheck>true</BufferSecurityCheck>

@@ -151,14 +151,14 @@
     </Link>

     <ResourceCompile>

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

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

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

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <BufferSecurityCheck>true</BufferSecurityCheck>

@@ -177,38 +177,38 @@
     </Link>

     <ResourceCompile>

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

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

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

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

     <ClCompile Include="..\Utils\mir_dblists.cpp">

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

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

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

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

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

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

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

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

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="mydetails.cpp">

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/MyDetails/mydetails.vcxproj.filters b/plugins/MyDetails/mydetails.vcxproj.filters
index 1b4ed68251..6551fafecb 100644
--- a/plugins/MyDetails/mydetails.vcxproj.filters
+++ b/plugins/MyDetails/mydetails.vcxproj.filters
@@ -15,10 +15,10 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="data.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="frame.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

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

@@ -27,10 +27,10 @@
     <ClCompile Include="..\utils\mir_smileys.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="mydetails.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="..\Utils\mir_dblists.cpp">

@@ -38,18 +38,18 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="commons.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="data.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="frame.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

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

@@ -64,7 +64,7 @@
     <ClInclude Include="..\utils\mir_smileys.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="options.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/plugins/MyDetails/resource.rc b/plugins/MyDetails/res/resource.rc
index da0ebf3c11..9721f9b452 100644
--- a/plugins/MyDetails/resource.rc
+++ b/plugins/MyDetails/res/resource.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -8,7 +8,7 @@
 // Generated from the TEXTINCLUDE 2 resource.

 //

 #include "afxres.h"

-#include "../../include/statusmodes.h"

+#include "statusmodes.h"

 

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

 #undef APSTUDIO_READONLY_SYMBOLS

@@ -22,7 +22,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)

 #endif //_WIN32

 

-#ifndef _MAC

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

 //

 // Version

@@ -65,8 +64,6 @@ BEGIN
     END

 END

 

-#endif    // !_MAC

-

 

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

 //

@@ -235,9 +232,9 @@ END
 

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

 // remains consistent on all systems.

-IDI_LISTENINGTO         ICON    DISCARDABLE     "res\\listening_to.ico"

-IDI_RIGHT_ARROW         ICON    DISCARDABLE     "res\\rightarrow.ico"

-IDI_LEFT_ARROW          ICON    DISCARDABLE     "res\\leftarrow.ico"

+IDI_LISTENINGTO         ICON     "listening_to.ico"

+IDI_RIGHT_ARROW         ICON     "rightarrow.ico"

+IDI_LEFT_ARROW          ICON     "leftarrow.ico"

 #endif    // English (U.S.) resources

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

 

@@ -257,19 +254,19 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 // 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"

-    "#include ""../../include/statusmodes.h""\r\n"

+    "#include ""statusmodes.h""\r\n"

     "\0"

 END

 

-3 TEXTINCLUDE DISCARDABLE 

+3 TEXTINCLUDE 

 BEGIN

     "\r\n"

     "\0"

diff --git a/plugins/MyDetails/commons.h b/plugins/MyDetails/src/commons.h
index 4753c28d70..4753c28d70 100644
--- a/plugins/MyDetails/commons.h
+++ b/plugins/MyDetails/src/commons.h
diff --git a/plugins/MyDetails/data.cpp b/plugins/MyDetails/src/data.cpp
index c29af17ed0..c29af17ed0 100644
--- a/plugins/MyDetails/data.cpp
+++ b/plugins/MyDetails/src/data.cpp
diff --git a/plugins/MyDetails/data.h b/plugins/MyDetails/src/data.h
index d8c75beda4..d8c75beda4 100644
--- a/plugins/MyDetails/data.h
+++ b/plugins/MyDetails/src/data.h
diff --git a/plugins/MyDetails/frame.cpp b/plugins/MyDetails/src/frame.cpp
index baaf0b26dd..baaf0b26dd 100644
--- a/plugins/MyDetails/frame.cpp
+++ b/plugins/MyDetails/src/frame.cpp
diff --git a/plugins/MyDetails/frame.h b/plugins/MyDetails/src/frame.h
index 5382d3ed46..5382d3ed46 100644
--- a/plugins/MyDetails/frame.h
+++ b/plugins/MyDetails/src/frame.h
diff --git a/plugins/MyDetails/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp
index 4b34041cbb..4b34041cbb 100644
--- a/plugins/MyDetails/mydetails.cpp
+++ b/plugins/MyDetails/src/mydetails.cpp
diff --git a/plugins/MyDetails/options.cpp b/plugins/MyDetails/src/options.cpp
index a4b722b241..a4b722b241 100644
--- a/plugins/MyDetails/options.cpp
+++ b/plugins/MyDetails/src/options.cpp
diff --git a/plugins/MyDetails/options.h b/plugins/MyDetails/src/options.h
index c8b11ef725..c8b11ef725 100644
--- a/plugins/MyDetails/options.h
+++ b/plugins/MyDetails/src/options.h
diff --git a/plugins/MyDetails/resource.h b/plugins/MyDetails/src/resource.h
index b53e46d1a3..b53e46d1a3 100644
--- a/plugins/MyDetails/resource.h
+++ b/plugins/MyDetails/src/resource.h
diff --git a/plugins/NewEventNotify/!changelog.txt b/plugins/NewEventNotify/docs/!changelog.txt
index 5c755ee40c..5c755ee40c 100644
--- a/plugins/NewEventNotify/!changelog.txt
+++ b/plugins/NewEventNotify/docs/!changelog.txt
diff --git a/plugins/NewEventNotify/neweventnotify-translation.txt b/plugins/NewEventNotify/docs/neweventnotify-translation.txt
index 3df8e8a907..3df8e8a907 100644
--- a/plugins/NewEventNotify/neweventnotify-translation.txt
+++ b/plugins/NewEventNotify/docs/neweventnotify-translation.txt
diff --git a/plugins/NewEventNotify/neweventnotify.vcxproj b/plugins/NewEventNotify/neweventnotify.vcxproj
index d2e776cd08..7f7b394793 100644
--- a/plugins/NewEventNotify/neweventnotify.vcxproj
+++ b/plugins/NewEventNotify/neweventnotify.vcxproj
@@ -78,7 +78,7 @@
       <MinimalRebuild>true</MinimalRebuild>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

     </ClCompile>

     <ResourceCompile>

@@ -101,7 +101,7 @@
       <Optimization>Disabled</Optimization>

       <WarningLevel>Level3</WarningLevel>

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

     </ClCompile>

     <ResourceCompile>

@@ -125,7 +125,7 @@
       <Optimization>Full</Optimization>

       <WarningLevel>Level3</WarningLevel>

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

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

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

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <ResourceCompile>

@@ -151,7 +151,7 @@
       <Optimization>Full</Optimization>

       <WarningLevel>Level3</WarningLevel>

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

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

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

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <ResourceCompile>

@@ -170,21 +170,17 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

   </ItemGroup>

   <ItemGroup>

-    <CustomBuild Include="res\popup.ico" />

-    <CustomBuild Include="res\popup_no.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/NewEventNotify/neweventnotify.vcxproj.filters b/plugins/NewEventNotify/neweventnotify.vcxproj.filters
index 8e60643dca..533d2bbf39 100644
--- a/plugins/NewEventNotify/neweventnotify.vcxproj.filters
+++ b/plugins/NewEventNotify/neweventnotify.vcxproj.filters
@@ -15,38 +15,30 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="main.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="menuitem.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="popup.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="neweventnotify.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="resource.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

-  <ItemGroup>

-    <CustomBuild Include="res\popup.ico">

-      <Filter>Resource Files</Filter>

-    </CustomBuild>

-    <CustomBuild Include="res\popup_no.ico">

-      <Filter>Resource Files</Filter>

-    </CustomBuild>

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/NewEventNotify/resource.rc b/plugins/NewEventNotify/res/resource.rc
index 8e18c89ae5..c3b672b955 100644
--- a/plugins/NewEventNotify/resource.rc
+++ b/plugins/NewEventNotify/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -152,7 +152,7 @@ END
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

@@ -191,8 +191,8 @@ END
 

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

 // remains consistent on all systems.

-IDI_ENABLED             ICON                    "res\\popup.ico"

-IDI_DISABLED            ICON                    "res\\popup_no.ico"

+IDI_ENABLED             ICON                    "popup.ico"

+IDI_DISABLED            ICON                    "popup_no.ico"

 #endif    // English (U.S.) resources

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

 

diff --git a/plugins/NewEventNotify/main.cpp b/plugins/NewEventNotify/src/main.cpp
index 850a01fa7a..850a01fa7a 100644
--- a/plugins/NewEventNotify/main.cpp
+++ b/plugins/NewEventNotify/src/main.cpp
diff --git a/plugins/NewEventNotify/menuitem.cpp b/plugins/NewEventNotify/src/menuitem.cpp
index 6831c204a1..6831c204a1 100644
--- a/plugins/NewEventNotify/menuitem.cpp
+++ b/plugins/NewEventNotify/src/menuitem.cpp
diff --git a/plugins/NewEventNotify/neweventnotify.h b/plugins/NewEventNotify/src/neweventnotify.h
index 3818e410e9..3818e410e9 100644
--- a/plugins/NewEventNotify/neweventnotify.h
+++ b/plugins/NewEventNotify/src/neweventnotify.h
diff --git a/plugins/NewEventNotify/options.cpp b/plugins/NewEventNotify/src/options.cpp
index 2e22a9f5cd..2e22a9f5cd 100644
--- a/plugins/NewEventNotify/options.cpp
+++ b/plugins/NewEventNotify/src/options.cpp
diff --git a/plugins/NewEventNotify/popup.cpp b/plugins/NewEventNotify/src/popup.cpp
index 355ef6cc86..355ef6cc86 100644
--- a/plugins/NewEventNotify/popup.cpp
+++ b/plugins/NewEventNotify/src/popup.cpp
diff --git a/plugins/NewEventNotify/resource.h b/plugins/NewEventNotify/src/resource.h
index 1146a3bfab..1146a3bfab 100644
--- a/plugins/NewEventNotify/resource.h
+++ b/plugins/NewEventNotify/src/resource.h