NotesAndReminders, Nudge, OpenFolder, PackUpdater: changed folder structure

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

28 files changed, 40 insertions, 55 deletions

diff --git a/plugins/NotesAndReminders/NotesReminders.vcxproj b/plugins/NotesAndReminders/NotesReminders.vcxproj
index 21a616736d..d77a0f481c 100644
--- a/plugins/NotesAndReminders/NotesReminders.vcxproj
+++ b/plugins/NotesAndReminders/NotesReminders.vcxproj
@@ -45,13 +45,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

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

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>globals.h</PrecompiledHeaderFile>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

     </ClCompile>

     <ResourceCompile>

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

@@ -72,7 +73,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

@@ -97,27 +98,22 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

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

-    <ClCompile Include="main.cpp">

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

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

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

+      <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

-    <None Include="N&amp;R - langpack.txt" />

-    <None Include="N&amp;R - readme.txt" />

-  </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/NotesAndReminders/NotesReminders.vcxproj.filters b/plugins/NotesAndReminders/NotesReminders.vcxproj.filters
index 6ccf89abc3..5eccb5444e 100644
--- a/plugins/NotesAndReminders/NotesReminders.vcxproj.filters
+++ b/plugins/NotesAndReminders/NotesReminders.vcxproj.filters
@@ -13,51 +13,40 @@
       <UniqueIdentifier>{38ee8469-7af5-4130-90a1-f4e8c620f475}</UniqueIdentifier>

       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

     </Filter>

-    <Filter Include="Custom Files">

-      <UniqueIdentifier>{81e2a913-4aac-4c50-aa77-6c231f934c76}</UniqueIdentifier>

-    </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="hotkeys.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="miscutils.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="notes.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="reminders.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="globals.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="miscutils.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="N&amp;R - langpack.txt">

-      <Filter>Custom Files</Filter>

-    </None>

-    <None Include="N&amp;R - readme.txt">

-      <Filter>Custom Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="resource.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/NotesAndReminders/N&R - langpack.txt b/plugins/NotesAndReminders/docs/N&R - langpack.txt
index ebb446c99b..ebb446c99b 100644
--- a/plugins/NotesAndReminders/N&R - langpack.txt
+++ b/plugins/NotesAndReminders/docs/N&R - langpack.txt
diff --git a/plugins/NotesAndReminders/N&R - readme.txt b/plugins/NotesAndReminders/docs/N&R - readme.txt
index 30ced4b8f1..30ced4b8f1 100644
--- a/plugins/NotesAndReminders/N&R - readme.txt
+++ b/plugins/NotesAndReminders/docs/N&R - readme.txt
diff --git a/plugins/NotesAndReminders/icons/addremin.ico b/plugins/NotesAndReminders/res/addremin.ico
index 0264fd1716..0264fd1716 100644
--- a/plugins/NotesAndReminders/icons/addremin.ico
+++ b/plugins/NotesAndReminders/res/addremin.ico
diff --git a/plugins/NotesAndReminders/icons/bringfront.ico b/plugins/NotesAndReminders/res/bringfront.ico
index 11984568a8..11984568a8 100644
--- a/plugins/NotesAndReminders/icons/bringfront.ico
+++ b/plugins/NotesAndReminders/res/bringfront.ico
diff --git a/plugins/NotesAndReminders/icons/captioni.ico b/plugins/NotesAndReminders/res/captioni.ico
index c7543c075f..c7543c075f 100644
--- a/plugins/NotesAndReminders/icons/captioni.ico
+++ b/plugins/NotesAndReminders/res/captioni.ico
diff --git a/plugins/NotesAndReminders/icons/captionn.ico b/plugins/NotesAndReminders/res/captionn.ico
index fd925f0660..fd925f0660 100644
--- a/plugins/NotesAndReminders/icons/captionn.ico
+++ b/plugins/NotesAndReminders/res/captionn.ico
diff --git a/plugins/NotesAndReminders/icons/deleteic.ico b/plugins/NotesAndReminders/res/deleteic.ico
index 5aa90434c1..5aa90434c1 100644
--- a/plugins/NotesAndReminders/icons/deleteic.ico
+++ b/plugins/NotesAndReminders/res/deleteic.ico
diff --git a/plugins/NotesAndReminders/icons/deletere.ico b/plugins/NotesAndReminders/res/deletere.ico
index 8560fc8f5e..8560fc8f5e 100644
--- a/plugins/NotesAndReminders/icons/deletere.ico
+++ b/plugins/NotesAndReminders/res/deletere.ico
diff --git a/plugins/NotesAndReminders/icons/hidenote.ico b/plugins/NotesAndReminders/res/hidenote.ico
index bada524874..bada524874 100644
--- a/plugins/NotesAndReminders/icons/hidenote.ico
+++ b/plugins/NotesAndReminders/res/hidenote.ico
diff --git a/plugins/NotesAndReminders/icons/noteicon.ico b/plugins/NotesAndReminders/res/noteicon.ico
index 5479ed29e7..5479ed29e7 100644
--- a/plugins/NotesAndReminders/icons/noteicon.ico
+++ b/plugins/NotesAndReminders/res/noteicon.ico
diff --git a/plugins/NotesAndReminders/icons/playsound.ico b/plugins/NotesAndReminders/res/playsound.ico
index 0e3711dbc5..0e3711dbc5 100644
--- a/plugins/NotesAndReminders/icons/playsound.ico
+++ b/plugins/NotesAndReminders/res/playsound.ico
diff --git a/plugins/NotesAndReminders/icons/reminder.ico b/plugins/NotesAndReminders/res/reminder.ico
index d3bed91d4d..d3bed91d4d 100644
--- a/plugins/NotesAndReminders/icons/reminder.ico
+++ b/plugins/NotesAndReminders/res/reminder.ico
diff --git a/plugins/NotesAndReminders/icons/removeno.ico b/plugins/NotesAndReminders/res/removeno.ico
index d2aae887a6..d2aae887a6 100644
--- a/plugins/NotesAndReminders/icons/removeno.ico
+++ b/plugins/NotesAndReminders/res/removeno.ico
diff --git a/plugins/NotesAndReminders/resource.rc b/plugins/NotesAndReminders/res/resource.rc
index d438fabc25..064efb6453 100644
--- a/plugins/NotesAndReminders/resource.rc
+++ b/plugins/NotesAndReminders/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -29,7 +29,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

@@ -213,20 +213,20 @@ END
 

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

 // remains consistent on all systems.

-IDI_ADDREMINDER             ICON                    "icons/addremin.ico"

-IDI_DELETEICON              ICON                    "icons/deleteic.ico"

-IDI_NOTEICON                ICON                    "icons/noteicon.ico"

-IDI_SHOWHIDE                ICON                    "icons/showhide.ico"

-IDI_CAPTIONICON             ICON                    "icons/captioni.ico"

-IDI_DELETEREMINDER          ICON                    "icons/deletere.ico"

-IDI_VIEWREMINDERS           ICON                    "icons/viewremi.ico"

-IDI_CAPTIONICONNOTTOP       ICON                    "icons/captionn.ico"

-IDI_HIDENOTE                ICON                    "icons/hidenote.ico"

-IDI_REMOVENOTE              ICON                    "icons/removeno.ico"

-IDI_REMINDER                ICON                    "icons/reminder.ico"

-IDI_BRINGFRONT              ICON                    "icons/bringfront.ico"

-IDI_PLAYSOUND               ICON                    "icons/playsound.ico"

-IDI_VIEWNOTES               ICON                    "icons/viewnotes.ico"

+IDI_ADDREMINDER             ICON                    "addremin.ico"

+IDI_DELETEICON              ICON                    "deleteic.ico"

+IDI_NOTEICON                ICON                    "noteicon.ico"

+IDI_SHOWHIDE                ICON                    "showhide.ico"

+IDI_CAPTIONICON             ICON                    "captioni.ico"

+IDI_DELETEREMINDER          ICON                    "deletere.ico"

+IDI_VIEWREMINDERS           ICON                    "viewremi.ico"

+IDI_CAPTIONICONNOTTOP       ICON                    "captionn.ico"

+IDI_HIDENOTE                ICON                    "hidenote.ico"

+IDI_REMOVENOTE              ICON                    "removeno.ico"

+IDI_REMINDER                ICON                    "reminder.ico"

+IDI_BRINGFRONT              ICON                    "bringfront.ico"

+IDI_PLAYSOUND               ICON                    "playsound.ico"

+IDI_VIEWNOTES               ICON                    "viewnotes.ico"

 

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

 //

diff --git a/plugins/NotesAndReminders/icons/showhide.ico b/plugins/NotesAndReminders/res/showhide.ico
index 99b241d4fb..99b241d4fb 100644
--- a/plugins/NotesAndReminders/icons/showhide.ico
+++ b/plugins/NotesAndReminders/res/showhide.ico
diff --git a/plugins/NotesAndReminders/icons/viewnotes.ico b/plugins/NotesAndReminders/res/viewnotes.ico
index 18057a372a..18057a372a 100644
--- a/plugins/NotesAndReminders/icons/viewnotes.ico
+++ b/plugins/NotesAndReminders/res/viewnotes.ico
diff --git a/plugins/NotesAndReminders/icons/viewremi.ico b/plugins/NotesAndReminders/res/viewremi.ico
index b9e8bce9d5..b9e8bce9d5 100644
--- a/plugins/NotesAndReminders/icons/viewremi.ico
+++ b/plugins/NotesAndReminders/res/viewremi.ico
diff --git a/plugins/NotesAndReminders/globals.h b/plugins/NotesAndReminders/src/globals.h
index f8cc794e4a..f8cc794e4a 100644
--- a/plugins/NotesAndReminders/globals.h
+++ b/plugins/NotesAndReminders/src/globals.h
diff --git a/plugins/NotesAndReminders/hotkeys.cpp b/plugins/NotesAndReminders/src/hotkeys.cpp
index a8bd8d3c53..a8bd8d3c53 100644
--- a/plugins/NotesAndReminders/hotkeys.cpp
+++ b/plugins/NotesAndReminders/src/hotkeys.cpp
diff --git a/plugins/NotesAndReminders/main.cpp b/plugins/NotesAndReminders/src/main.cpp
index 2165a8e49b..2165a8e49b 100644
--- a/plugins/NotesAndReminders/main.cpp
+++ b/plugins/NotesAndReminders/src/main.cpp
diff --git a/plugins/NotesAndReminders/miscutils.cpp b/plugins/NotesAndReminders/src/miscutils.cpp
index b4de98404c..b4de98404c 100644
--- a/plugins/NotesAndReminders/miscutils.cpp
+++ b/plugins/NotesAndReminders/src/miscutils.cpp
diff --git a/plugins/NotesAndReminders/miscutils.h b/plugins/NotesAndReminders/src/miscutils.h
index 104de5313c..104de5313c 100644
--- a/plugins/NotesAndReminders/miscutils.h
+++ b/plugins/NotesAndReminders/src/miscutils.h
diff --git a/plugins/NotesAndReminders/notes.cpp b/plugins/NotesAndReminders/src/notes.cpp
index 5f98768d8b..5f98768d8b 100644
--- a/plugins/NotesAndReminders/notes.cpp
+++ b/plugins/NotesAndReminders/src/notes.cpp
diff --git a/plugins/NotesAndReminders/options.cpp b/plugins/NotesAndReminders/src/options.cpp
index 8e15946db9..8e15946db9 100644
--- a/plugins/NotesAndReminders/options.cpp
+++ b/plugins/NotesAndReminders/src/options.cpp
diff --git a/plugins/NotesAndReminders/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp
index 0d545056f9..0d545056f9 100644
--- a/plugins/NotesAndReminders/reminders.cpp
+++ b/plugins/NotesAndReminders/src/reminders.cpp
diff --git a/plugins/NotesAndReminders/resource.h b/plugins/NotesAndReminders/src/resource.h
index 0ddf8b4031..0ddf8b4031 100644
--- a/plugins/NotesAndReminders/resource.h
+++ b/plugins/NotesAndReminders/src/resource.h