NotesAndReminders, Nudge, OpenFolder, PackUpdater: changed folder structure

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

25 files changed, 48 insertions, 85 deletions

diff --git a/plugins/Nudge/ChangeLog.txt b/plugins/Nudge/docs/ChangeLog.txt
index 140671c177..140671c177 100644
--- a/plugins/Nudge/ChangeLog.txt
+++ b/plugins/Nudge/docs/ChangeLog.txt
diff --git a/plugins/Nudge/Sounds/nudge.wav b/plugins/Nudge/docs/Sounds/nudge.wav
index 938812970c..938812970c 100644
--- a/plugins/Nudge/Sounds/nudge.wav
+++ b/plugins/Nudge/docs/Sounds/nudge.wav
diff --git a/plugins/Nudge/autoexec_nudge.ini b/plugins/Nudge/docs/autoexec_nudge.ini
index d5e9a563da..d5e9a563da 100644
--- a/plugins/Nudge/autoexec_nudge.ini
+++ b/plugins/Nudge/docs/autoexec_nudge.ini
diff --git a/plugins/Nudge/nudge-translation.txt b/plugins/Nudge/docs/nudge-translation.txt
index 454dd7ef60..454dd7ef60 100644
--- a/plugins/Nudge/nudge-translation.txt
+++ b/plugins/Nudge/docs/nudge-translation.txt
diff --git a/plugins/Nudge/miranda.ico b/plugins/Nudge/miranda.ico
deleted file mode 100644
index 4fba0d431a..0000000000
--- a/plugins/Nudge/miranda.ico
+++ /dev/null
diff --git a/plugins/Nudge/nudge_10.vcxproj b/plugins/Nudge/nudge_10.vcxproj
index 80400c5152..f5b50a0d35 100644
--- a/plugins/Nudge/nudge_10.vcxproj
+++ b/plugins/Nudge/nudge_10.vcxproj
@@ -21,7 +21,6 @@
   <PropertyGroup Label="Globals">

     <ProjectName>Nudge</ProjectName>

     <ProjectGuid>{8190CFAA-3B73-43D8-9101-8368E21F1864}</ProjectGuid>

-    <RootNamespace>nudge</RootNamespace>

   </PropertyGroup>

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

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -74,14 +73,13 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>

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

     </ClCompile>

     <ResourceCompile>

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

@@ -100,13 +98,12 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>

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

     </ClCompile>

     <ResourceCompile>

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

@@ -128,12 +125,11 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <OmitFramePointers>false</OmitFramePointers>

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

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

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

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

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

       <PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

@@ -158,12 +154,11 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <OmitFramePointers>false</OmitFramePointers>

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

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

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

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

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

       <PrecompiledHeaderFile>headers.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

@@ -182,33 +177,23 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="main.cpp">

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

-    <None Include="miranda.ico" />

-    <None Include="ChangeLog.txt" />

-    <None Include="resources\Nudge.ico" />

-    <None Include="resources\NudgeIRC.ico" />

-    <None Include="resources\NudgeMeta.ico" />

-    <None Include="resources\NudgeMSN.ico" />

-    <None Include="resources\NudgeTlen.ico" />

-    <None Include="resources\NudgeYahoo.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/Nudge/nudge_10.vcxproj.filters b/plugins/Nudge/nudge_10.vcxproj.filters
index d21def2c41..87af4fd86d 100644
--- a/plugins/Nudge/nudge_10.vcxproj.filters
+++ b/plugins/Nudge/nudge_10.vcxproj.filters
@@ -1,76 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <ItemGroup>

-    <ClCompile Include="main.cpp">

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{021e1c6f-a1a3-4538-b5a1-7df818ac8791}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{24214ff5-3fda-4081-a191-e7d6bbf80014}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{3041ddc0-6ef1-4fb6-a3bd-e81f1ce388eb}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="shake.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="nudge.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="headers.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="main.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="nudge.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="options.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="shake.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="ChangeLog.txt" />

-    <None Include="miranda.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="resources\Nudge.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="resources\NudgeIRC.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="resources\NudgeMeta.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="resources\NudgeMSN.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="resources\NudgeYahoo.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="resources\NudgeTlen.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{021e1c6f-a1a3-4538-b5a1-7df818ac8791}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{24214ff5-3fda-4081-a191-e7d6bbf80014}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{3041ddc0-6ef1-4fb6-a3bd-e81f1ce388eb}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="resource.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/Nudge/resources/Nudge.ico b/plugins/Nudge/res/Nudge.ico
index 29d9911214..29d9911214 100644
--- a/plugins/Nudge/resources/Nudge.ico
+++ b/plugins/Nudge/res/Nudge.ico
diff --git a/plugins/Nudge/resources/NudgeIRC.ico b/plugins/Nudge/res/NudgeIRC.ico
index f950403fa5..f950403fa5 100644
--- a/plugins/Nudge/resources/NudgeIRC.ico
+++ b/plugins/Nudge/res/NudgeIRC.ico
diff --git a/plugins/Nudge/resources/NudgeMSN.ico b/plugins/Nudge/res/NudgeMSN.ico
index c52057bc9e..c52057bc9e 100644
--- a/plugins/Nudge/resources/NudgeMSN.ico
+++ b/plugins/Nudge/res/NudgeMSN.ico
diff --git a/plugins/Nudge/resources/NudgeMeta.ico b/plugins/Nudge/res/NudgeMeta.ico
index fabd329f70..fabd329f70 100644
--- a/plugins/Nudge/resources/NudgeMeta.ico
+++ b/plugins/Nudge/res/NudgeMeta.ico
diff --git a/plugins/Nudge/resources/NudgeTlen.ico b/plugins/Nudge/res/NudgeTlen.ico
index d4a2c06930..d4a2c06930 100644
--- a/plugins/Nudge/resources/NudgeTlen.ico
+++ b/plugins/Nudge/res/NudgeTlen.ico
diff --git a/plugins/Nudge/resources/NudgeYahoo.ico b/plugins/Nudge/res/NudgeYahoo.ico
index 7bed3ca103..7bed3ca103 100644
--- a/plugins/Nudge/resources/NudgeYahoo.ico
+++ b/plugins/Nudge/res/NudgeYahoo.ico
diff --git a/plugins/Nudge/resource.rc b/plugins/Nudge/res/resource.rc
index 4188b695b4..4bdb574ccd 100644
--- a/plugins/Nudge/resource.rc
+++ b/plugins/Nudge/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -27,7 +27,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

@@ -262,16 +262,16 @@ END
 

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

 // remains consistent on all systems.

-IDI_NUDGE               ICON                    "resources\\Nudge.ico"

-IDI_NUGDE_YAHOO         ICON                    "resources\\NudgeYahoo.ico"

-IDI_NUDGE_IRC           ICON                    "resources\\NudgeIRC.ico"

-IDI_NUDGE_MSN           ICON                    "resources\\NudgeMSN.ico"

-IDI_NUDGE_TLEN          ICON                    "resources\\NudgeTlen.ico"

-IDI_NUDGE_META          ICON                    "resources\\NudgeMeta.ico"

+IDI_NUDGE               ICON                    "Nudge.ico"

+IDI_NUGDE_YAHOO         ICON                    "NudgeYahoo.ico"

+IDI_NUDGE_IRC           ICON                    "NudgeIRC.ico"

+IDI_NUDGE_MSN           ICON                    "NudgeMSN.ico"

+IDI_NUDGE_TLEN          ICON                    "NudgeTlen.ico"

+IDI_NUDGE_META          ICON                    "NudgeMeta.ico"

 #endif    // Neutral resources

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

 

-

+	

 

 #ifndef APSTUDIO_INVOKED

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

diff --git a/plugins/Nudge/resources/nudge msn.ico b/plugins/Nudge/resources/nudge msn.ico
deleted file mode 100644
index 77ad817b45..0000000000
--- a/plugins/Nudge/resources/nudge msn.ico
+++ /dev/null
diff --git a/plugins/Nudge/headers.h b/plugins/Nudge/src/headers.h
index 456af2d7ed..eb931c6da8 100644
--- a/plugins/Nudge/headers.h
+++ b/plugins/Nudge/src/headers.h
@@ -3,6 +3,8 @@
 // are changed infrequently

 //

 

+#define _CRT_SECURE_NO_WARNINGS

+

 #pragma once

 

 // Modify the following defines if you have to target a platform prior to the ones specified below.

diff --git a/plugins/Nudge/main.cpp b/plugins/Nudge/src/main.cpp
index c673ebe0c5..c673ebe0c5 100644
--- a/plugins/Nudge/main.cpp
+++ b/plugins/Nudge/src/main.cpp
diff --git a/plugins/Nudge/main.h b/plugins/Nudge/src/main.h
index 556ee0070b..556ee0070b 100644
--- a/plugins/Nudge/main.h
+++ b/plugins/Nudge/src/main.h
diff --git a/plugins/Nudge/nudge.cpp b/plugins/Nudge/src/nudge.cpp
index 0afa6edee0..0afa6edee0 100644
--- a/plugins/Nudge/nudge.cpp
+++ b/plugins/Nudge/src/nudge.cpp
diff --git a/plugins/Nudge/nudge.h b/plugins/Nudge/src/nudge.h
index 8a531639ca..8a531639ca 100644
--- a/plugins/Nudge/nudge.h
+++ b/plugins/Nudge/src/nudge.h
diff --git a/plugins/Nudge/options.cpp b/plugins/Nudge/src/options.cpp
index b0369143dc..b0369143dc 100644
--- a/plugins/Nudge/options.cpp
+++ b/plugins/Nudge/src/options.cpp
diff --git a/plugins/Nudge/options.h b/plugins/Nudge/src/options.h
index 68f648a0bb..68f648a0bb 100644
--- a/plugins/Nudge/options.h
+++ b/plugins/Nudge/src/options.h
diff --git a/plugins/Nudge/resource.h b/plugins/Nudge/src/resource.h
index 60a56388e2..60a56388e2 100644
--- a/plugins/Nudge/resource.h
+++ b/plugins/Nudge/src/resource.h
diff --git a/plugins/Nudge/shake.cpp b/plugins/Nudge/src/shake.cpp
index f396c4f535..f396c4f535 100644
--- a/plugins/Nudge/shake.cpp
+++ b/plugins/Nudge/src/shake.cpp
diff --git a/plugins/Nudge/shake.h b/plugins/Nudge/src/shake.h
index 73e460cb41..73e460cb41 100644
--- a/plugins/Nudge/shake.h
+++ b/plugins/Nudge/src/shake.h