summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2012-08-08 18:35:25 +0000
committerKirill Volinsky <mataes2007@gmail.com>2012-08-08 18:35:25 +0000
commit21f160111c9ff42bc3a40e50125cceea094e1d6d (patch)
tree7303d169928482a859dc6eb81f0b4843307d775a
parent6bccad35352a239573705d6c61235bcdb2b44426 (diff)
WhenWasIt changed folder structure
git-svn-id: http://svn.miranda-ng.org/main/trunk@1406 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/WhenWasIt/WhenWasIt_10.vcxproj78
-rw-r--r--plugins/WhenWasIt/WhenWasIt_10.vcxproj.filters108
-rw-r--r--plugins/WhenWasIt/docs/whenwasit-translation.txt (renamed from plugins/WhenWasIt/whenwasit-translation.txt)0
-rw-r--r--plugins/WhenWasIt/res/00.ico (renamed from plugins/WhenWasIt/icons/00.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/WhenWasIt.rc (renamed from plugins/WhenWasIt/WhenWasIt.rc)40
-rw-r--r--plugins/WhenWasIt/res/add.ico (renamed from plugins/WhenWasIt/icons/add.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/check.ico (renamed from plugins/WhenWasIt/icons/check.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/dlg.ico (renamed from plugins/WhenWasIt/icons/dlg.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/dtb0.ico (renamed from plugins/WhenWasIt/icons/dtb0.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/dtb1.ico (renamed from plugins/WhenWasIt/icons/dtb1.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/dtb2.ico (renamed from plugins/WhenWasIt/icons/dtb2.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/dtb3.ico (renamed from plugins/WhenWasIt/icons/dtb3.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/dtb4.ico (renamed from plugins/WhenWasIt/icons/dtb4.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/dtb5.ico (renamed from plugins/WhenWasIt/icons/dtb5.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/dtb6.ico (renamed from plugins/WhenWasIt/icons/dtb6.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/dtb7.ico (renamed from plugins/WhenWasIt/icons/dtb7.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/dtb8.ico (renamed from plugins/WhenWasIt/icons/dtb8.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/dtb9.ico (renamed from plugins/WhenWasIt/icons/dtb9.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/dtbX.ico (renamed from plugins/WhenWasIt/icons/dtbX.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/export.ico (renamed from plugins/WhenWasIt/icons/export.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/import.ico (renamed from plugins/WhenWasIt/icons/import.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/list.ico (renamed from plugins/WhenWasIt/icons/list.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/refresh.ico (renamed from plugins/WhenWasIt/icons/refresh.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/WhenWasIt/res/version.rc (renamed from plugins/WhenWasIt/version.rc)5
-rw-r--r--plugins/WhenWasIt/src/WhenWasIt.cpp (renamed from plugins/WhenWasIt/WhenWasIt.cpp)0
-rw-r--r--plugins/WhenWasIt/src/birthdays.cpp (renamed from plugins/WhenWasIt/birthdays.cpp)0
-rw-r--r--plugins/WhenWasIt/src/birthdays.h (renamed from plugins/WhenWasIt/birthdays.h)0
-rw-r--r--plugins/WhenWasIt/src/commonheaders.h (renamed from plugins/WhenWasIt/commonheaders.h)0
-rw-r--r--plugins/WhenWasIt/src/date_utils.cpp (renamed from plugins/WhenWasIt/date_utils.cpp)0
-rw-r--r--plugins/WhenWasIt/src/date_utils.h (renamed from plugins/WhenWasIt/date_utils.h)0
-rw-r--r--plugins/WhenWasIt/src/dlg_handlers.cpp (renamed from plugins/WhenWasIt/dlg_handlers.cpp)0
-rw-r--r--plugins/WhenWasIt/src/dlg_handlers.h (renamed from plugins/WhenWasIt/dlg_handlers.h)0
-rw-r--r--plugins/WhenWasIt/src/events.cpp (renamed from plugins/WhenWasIt/events.cpp)0
-rw-r--r--plugins/WhenWasIt/src/events.h (renamed from plugins/WhenWasIt/events.h)0
-rw-r--r--plugins/WhenWasIt/src/hooked_events.cpp (renamed from plugins/WhenWasIt/hooked_events.cpp)0
-rw-r--r--plugins/WhenWasIt/src/hooked_events.h (renamed from plugins/WhenWasIt/hooked_events.h)0
-rw-r--r--plugins/WhenWasIt/src/icons.cpp (renamed from plugins/WhenWasIt/icons.cpp)0
-rw-r--r--plugins/WhenWasIt/src/icons.h (renamed from plugins/WhenWasIt/icons.h)0
-rw-r--r--plugins/WhenWasIt/src/notifiers.cpp (renamed from plugins/WhenWasIt/notifiers.cpp)0
-rw-r--r--plugins/WhenWasIt/src/notifiers.h (renamed from plugins/WhenWasIt/notifiers.h)0
-rw-r--r--plugins/WhenWasIt/src/resource.h (renamed from plugins/WhenWasIt/resource.h)0
-rw-r--r--plugins/WhenWasIt/src/services.cpp (renamed from plugins/WhenWasIt/services.cpp)0
-rw-r--r--plugins/WhenWasIt/src/services.h (renamed from plugins/WhenWasIt/services.h)0
-rw-r--r--plugins/WhenWasIt/src/utils.cpp (renamed from plugins/WhenWasIt/utils.cpp)0
-rw-r--r--plugins/WhenWasIt/src/utils.h (renamed from plugins/WhenWasIt/utils.h)0
-rw-r--r--plugins/WhenWasIt/src/version.h (renamed from plugins/WhenWasIt/version.h)0
46 files changed, 74 insertions, 157 deletions
diff --git a/plugins/WhenWasIt/WhenWasIt_10.vcxproj b/plugins/WhenWasIt/WhenWasIt_10.vcxproj
index f565a1b7fb..6cccef0e0b 100644
--- a/plugins/WhenWasIt/WhenWasIt_10.vcxproj
+++ b/plugins/WhenWasIt/WhenWasIt_10.vcxproj
@@ -72,7 +72,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_USE_32BIT_TIME_T;_WINDOWS;_USRDLL;WHENWASIT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_USE_32BIT_TIME_T;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -101,7 +101,7 @@
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <PreprocessorDefinitions>WIN32;NDEBUG;_USE_32BIT_TIME_T;_WINDOWS;_USRDLL;WHENWASIT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_USE_32BIT_TIME_T;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -133,7 +133,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<WarningLevel>Level3</WarningLevel>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;WHENWASIT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
@@ -160,7 +160,7 @@
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;WHENWASIT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization>Disabled</Optimization>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
@@ -180,58 +180,36 @@
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="birthdays.cpp" />
- <ClCompile Include="date_utils.cpp" />
- <ClCompile Include="dlg_handlers.cpp" />
- <ClCompile Include="events.cpp" />
- <ClCompile Include="hooked_events.cpp" />
- <ClCompile Include="icons.cpp" />
- <ClCompile Include="notifiers.cpp" />
- <ClCompile Include="services.cpp" />
- <ClCompile Include="utils.cpp" />
- <ClCompile Include="WhenWasIt.cpp">
+ <ClCompile Include="src\birthdays.cpp" />
+ <ClCompile Include="src\date_utils.cpp" />
+ <ClCompile Include="src\dlg_handlers.cpp" />
+ <ClCompile Include="src\events.cpp" />
+ <ClCompile Include="src\hooked_events.cpp" />
+ <ClCompile Include="src\icons.cpp" />
+ <ClCompile Include="src\notifiers.cpp" />
+ <ClCompile Include="src\services.cpp" />
+ <ClCompile Include="src\utils.cpp" />
+ <ClCompile Include="src\WhenWasIt.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="birthdays.h" />
- <ClInclude Include="commonheaders.h" />
- <ClInclude Include="date_utils.h" />
- <ClInclude Include="dlg_handlers.h" />
- <ClInclude Include="events.h" />
- <ClInclude Include="hooked_events.h" />
- <ClInclude Include="icons.h" />
- <ClInclude Include="notifiers.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="services.h" />
- <ClInclude Include="utils.h" />
- <ClInclude Include="version.h" />
+ <ClInclude Include="src\birthdays.h" />
+ <ClInclude Include="src\commonheaders.h" />
+ <ClInclude Include="src\date_utils.h" />
+ <ClInclude Include="src\dlg_handlers.h" />
+ <ClInclude Include="src\events.h" />
+ <ClInclude Include="src\hooked_events.h" />
+ <ClInclude Include="src\icons.h" />
+ <ClInclude Include="src\notifiers.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\services.h" />
+ <ClInclude Include="src\utils.h" />
+ <ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
- <None Include="icons\add.ico" />
- <None Include="icons\check.bmp" />
- <None Include="icons\check.ico" />
- <None Include="icons\dlg.ico" />
- <None Include="icons\dtb0.ico" />
- <None Include="icons\dtb1.ico" />
- <None Include="icons\dtb2.ico" />
- <None Include="icons\dtb3.ico" />
- <None Include="icons\dtb4.ico" />
- <None Include="icons\dtb5.ico" />
- <None Include="icons\dtb6.ico" />
- <None Include="icons\dtb7.ico" />
- <None Include="icons\dtb8.ico" />
- <None Include="icons\dtb9.ico" />
- <None Include="icons\dtbX.ico" />
- <None Include="icons\export.ico" />
- <None Include="icons\import.ico" />
- <None Include="icons\list.ico" />
- <None Include="icons\refresh.ico" />
- <None Include="docs\WhenWasIt_readme.txt" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="version.rc" />
- <ResourceCompile Include="WhenWasIt.rc" />
+ <ResourceCompile Include="res\version.rc" />
+ <ResourceCompile Include="res\WhenWasIt.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/WhenWasIt/WhenWasIt_10.vcxproj.filters b/plugins/WhenWasIt/WhenWasIt_10.vcxproj.filters
index fda13603f3..ef915e8aae 100644
--- a/plugins/WhenWasIt/WhenWasIt_10.vcxproj.filters
+++ b/plugins/WhenWasIt/WhenWasIt_10.vcxproj.filters
@@ -15,140 +15,80 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="birthdays.cpp">
+ <ClCompile Include="src\src\birthdays.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="date_utils.cpp">
+ <ClCompile Include="src\src\date_utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="dlg_handlers.cpp">
+ <ClCompile Include="src\src\dlg_handlers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="events.cpp">
+ <ClCompile Include="src\events.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="hooked_events.cpp">
+ <ClCompile Include="src\hooked_events.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="icons.cpp">
+ <ClCompile Include="src\icons.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="notifiers.cpp">
+ <ClCompile Include="src\notifiers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="services.cpp">
+ <ClCompile Include="src\services.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="utils.cpp">
+ <ClCompile Include="src\utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="WhenWasIt.cpp">
+ <ClCompile Include="src\WhenWasIt.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="birthdays.h">
+ <ClInclude Include="src\birthdays.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="commonheaders.h">
+ <ClInclude Include="src\commonheaders.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="date_utils.h">
+ <ClInclude Include="src\date_utils.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="dlg_handlers.h">
+ <ClInclude Include="src\dlg_handlers.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="events.h">
+ <ClInclude Include="src\events.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="hooked_events.h">
+ <ClInclude Include="src\hooked_events.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="icons.h">
+ <ClInclude Include="src\icons.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="notifiers.h">
+ <ClInclude Include="src\notifiers.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="services.h">
+ <ClInclude Include="src\services.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="utils.h">
+ <ClInclude Include="src\utils.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="version.h">
+ <ClInclude Include="src\version.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="icons\add.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\check.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\check.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\dlg.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\dtb0.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\dtb1.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\dtb2.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\dtb3.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\dtb4.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\dtb5.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\dtb6.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\dtb7.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\dtb8.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\dtb9.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\dtbX.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\export.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\import.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\list.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\refresh.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="docs\WhenWasIt_readme.txt" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="version.rc">
+ <ResourceCompile Include="res\version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
- <ResourceCompile Include="WhenWasIt.rc">
+ <ResourceCompile Include="res\WhenWasIt.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/plugins/WhenWasIt/whenwasit-translation.txt b/plugins/WhenWasIt/docs/whenwasit-translation.txt
index bf44195ebe..bf44195ebe 100644
--- a/plugins/WhenWasIt/whenwasit-translation.txt
+++ b/plugins/WhenWasIt/docs/whenwasit-translation.txt
diff --git a/plugins/WhenWasIt/icons/00.ico b/plugins/WhenWasIt/res/00.ico
index db6ad259de..db6ad259de 100644
--- a/plugins/WhenWasIt/icons/00.ico
+++ b/plugins/WhenWasIt/res/00.ico
Binary files differ
diff --git a/plugins/WhenWasIt/WhenWasIt.rc b/plugins/WhenWasIt/res/WhenWasIt.rc
index 97acb82865..35c23cf8dd 100644
--- a/plugins/WhenWasIt/WhenWasIt.rc
+++ b/plugins/WhenWasIt/res/WhenWasIt.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_ENGLISH, SUBLANG_ENGLISH_US
1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
@@ -222,24 +222,24 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_BIRTHDAYS_DLG ICON "icons\\dlg.ico"
-IDI_CHECK ICON "icons\\check.ico"
-IDI_LIST ICON "icons\\list.ico"
-IDI_DTB1 ICON "icons\\dtb1.ico"
-IDI_DTB9 ICON "icons\\dtb9.ico"
-IDI_DTB2 ICON "icons\\dtb2.ico"
-IDI_DTB3 ICON "icons\\dtb3.ico"
-IDI_DTB4 ICON "icons\\dtb4.ico"
-IDI_DTB5 ICON "icons\\dtb5.ico"
-IDI_DTB6 ICON "icons\\dtb6.ico"
-IDI_DTB7 ICON "icons\\dtb7.ico"
-IDI_DTB8 ICON "icons\\dtb8.ico"
-IDI_DTB0 ICON "icons\\dtb0.ico"
-IDI_DTBMORE ICON "icons\\dtbX.ico"
-IDI_ADD ICON "icons\\add.ico"
-IDI_REFRESH_USERDETAILS ICON "icons\\refresh.ico"
-IDI_IMPORT_BIRTHDAYS ICON "icons\\import.ico"
-IDI_EXPORT_BIRTHDAYS ICON "icons\\export.ico"
+IDI_BIRTHDAYS_DLG ICON "dlg.ico"
+IDI_CHECK ICON "check.ico"
+IDI_LIST ICON "list.ico"
+IDI_DTB1 ICON "dtb1.ico"
+IDI_DTB9 ICON "dtb9.ico"
+IDI_DTB2 ICON "dtb2.ico"
+IDI_DTB3 ICON "dtb3.ico"
+IDI_DTB4 ICON "dtb4.ico"
+IDI_DTB5 ICON "dtb5.ico"
+IDI_DTB6 ICON "dtb6.ico"
+IDI_DTB7 ICON "dtb7.ico"
+IDI_DTB8 ICON "dtb8.ico"
+IDI_DTB0 ICON "dtb0.ico"
+IDI_DTBMORE ICON "dtbX.ico"
+IDI_ADD ICON "add.ico"
+IDI_REFRESH_USERDETAILS ICON "refresh.ico"
+IDI_IMPORT_BIRTHDAYS ICON "import.ico"
+IDI_EXPORT_BIRTHDAYS ICON "export.ico"
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/plugins/WhenWasIt/icons/add.ico b/plugins/WhenWasIt/res/add.ico
index 503f5809f3..503f5809f3 100644
--- a/plugins/WhenWasIt/icons/add.ico
+++ b/plugins/WhenWasIt/res/add.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/check.ico b/plugins/WhenWasIt/res/check.ico
index 6e66db6fe9..6e66db6fe9 100644
--- a/plugins/WhenWasIt/icons/check.ico
+++ b/plugins/WhenWasIt/res/check.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/dlg.ico b/plugins/WhenWasIt/res/dlg.ico
index 68e4d3a004..68e4d3a004 100644
--- a/plugins/WhenWasIt/icons/dlg.ico
+++ b/plugins/WhenWasIt/res/dlg.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/dtb0.ico b/plugins/WhenWasIt/res/dtb0.ico
index 037c31c939..037c31c939 100644
--- a/plugins/WhenWasIt/icons/dtb0.ico
+++ b/plugins/WhenWasIt/res/dtb0.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/dtb1.ico b/plugins/WhenWasIt/res/dtb1.ico
index 4840bbee3e..4840bbee3e 100644
--- a/plugins/WhenWasIt/icons/dtb1.ico
+++ b/plugins/WhenWasIt/res/dtb1.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/dtb2.ico b/plugins/WhenWasIt/res/dtb2.ico
index 54e5fc14a3..54e5fc14a3 100644
--- a/plugins/WhenWasIt/icons/dtb2.ico
+++ b/plugins/WhenWasIt/res/dtb2.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/dtb3.ico b/plugins/WhenWasIt/res/dtb3.ico
index 479913ded6..479913ded6 100644
--- a/plugins/WhenWasIt/icons/dtb3.ico
+++ b/plugins/WhenWasIt/res/dtb3.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/dtb4.ico b/plugins/WhenWasIt/res/dtb4.ico
index f8825f5f30..f8825f5f30 100644
--- a/plugins/WhenWasIt/icons/dtb4.ico
+++ b/plugins/WhenWasIt/res/dtb4.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/dtb5.ico b/plugins/WhenWasIt/res/dtb5.ico
index beac5bac42..beac5bac42 100644
--- a/plugins/WhenWasIt/icons/dtb5.ico
+++ b/plugins/WhenWasIt/res/dtb5.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/dtb6.ico b/plugins/WhenWasIt/res/dtb6.ico
index efb04a9f6e..efb04a9f6e 100644
--- a/plugins/WhenWasIt/icons/dtb6.ico
+++ b/plugins/WhenWasIt/res/dtb6.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/dtb7.ico b/plugins/WhenWasIt/res/dtb7.ico
index 87ca751736..87ca751736 100644
--- a/plugins/WhenWasIt/icons/dtb7.ico
+++ b/plugins/WhenWasIt/res/dtb7.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/dtb8.ico b/plugins/WhenWasIt/res/dtb8.ico
index e166704921..e166704921 100644
--- a/plugins/WhenWasIt/icons/dtb8.ico
+++ b/plugins/WhenWasIt/res/dtb8.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/dtb9.ico b/plugins/WhenWasIt/res/dtb9.ico
index d7307d5527..d7307d5527 100644
--- a/plugins/WhenWasIt/icons/dtb9.ico
+++ b/plugins/WhenWasIt/res/dtb9.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/dtbX.ico b/plugins/WhenWasIt/res/dtbX.ico
index 7c0f421183..7c0f421183 100644
--- a/plugins/WhenWasIt/icons/dtbX.ico
+++ b/plugins/WhenWasIt/res/dtbX.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/export.ico b/plugins/WhenWasIt/res/export.ico
index 8a80733ef4..8a80733ef4 100644
--- a/plugins/WhenWasIt/icons/export.ico
+++ b/plugins/WhenWasIt/res/export.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/import.ico b/plugins/WhenWasIt/res/import.ico
index 2e2904416d..2e2904416d 100644
--- a/plugins/WhenWasIt/icons/import.ico
+++ b/plugins/WhenWasIt/res/import.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/list.ico b/plugins/WhenWasIt/res/list.ico
index 00c219c6eb..00c219c6eb 100644
--- a/plugins/WhenWasIt/icons/list.ico
+++ b/plugins/WhenWasIt/res/list.ico
Binary files differ
diff --git a/plugins/WhenWasIt/icons/refresh.ico b/plugins/WhenWasIt/res/refresh.ico
index db6ad259de..db6ad259de 100644
--- a/plugins/WhenWasIt/icons/refresh.ico
+++ b/plugins/WhenWasIt/res/refresh.ico
Binary files differ
diff --git a/plugins/WhenWasIt/version.rc b/plugins/WhenWasIt/res/version.rc
index cd65db2ee3..c4e7212bd7 100644
--- a/plugins/WhenWasIt/version.rc
+++ b/plugins/WhenWasIt/res/version.rc
@@ -4,8 +4,7 @@
#error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
-#include "resource.h"
-#include "version.h"
+#include "..\src\version.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -34,7 +33,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 TEXTINCLUDE
BEGIN
- "resource1.h\0"
+ "..\\src\\version.h\0"
END
2 TEXTINCLUDE
diff --git a/plugins/WhenWasIt/WhenWasIt.cpp b/plugins/WhenWasIt/src/WhenWasIt.cpp
index de77127c7e..de77127c7e 100644
--- a/plugins/WhenWasIt/WhenWasIt.cpp
+++ b/plugins/WhenWasIt/src/WhenWasIt.cpp
diff --git a/plugins/WhenWasIt/birthdays.cpp b/plugins/WhenWasIt/src/birthdays.cpp
index baed614aad..baed614aad 100644
--- a/plugins/WhenWasIt/birthdays.cpp
+++ b/plugins/WhenWasIt/src/birthdays.cpp
diff --git a/plugins/WhenWasIt/birthdays.h b/plugins/WhenWasIt/src/birthdays.h
index c54042800c..c54042800c 100644
--- a/plugins/WhenWasIt/birthdays.h
+++ b/plugins/WhenWasIt/src/birthdays.h
diff --git a/plugins/WhenWasIt/commonheaders.h b/plugins/WhenWasIt/src/commonheaders.h
index a231fafba8..a231fafba8 100644
--- a/plugins/WhenWasIt/commonheaders.h
+++ b/plugins/WhenWasIt/src/commonheaders.h
diff --git a/plugins/WhenWasIt/date_utils.cpp b/plugins/WhenWasIt/src/date_utils.cpp
index e9da2253e0..e9da2253e0 100644
--- a/plugins/WhenWasIt/date_utils.cpp
+++ b/plugins/WhenWasIt/src/date_utils.cpp
diff --git a/plugins/WhenWasIt/date_utils.h b/plugins/WhenWasIt/src/date_utils.h
index 45db98fad7..45db98fad7 100644
--- a/plugins/WhenWasIt/date_utils.h
+++ b/plugins/WhenWasIt/src/date_utils.h
diff --git a/plugins/WhenWasIt/dlg_handlers.cpp b/plugins/WhenWasIt/src/dlg_handlers.cpp
index 37160995e2..37160995e2 100644
--- a/plugins/WhenWasIt/dlg_handlers.cpp
+++ b/plugins/WhenWasIt/src/dlg_handlers.cpp
diff --git a/plugins/WhenWasIt/dlg_handlers.h b/plugins/WhenWasIt/src/dlg_handlers.h
index 10e1b1ff2b..10e1b1ff2b 100644
--- a/plugins/WhenWasIt/dlg_handlers.h
+++ b/plugins/WhenWasIt/src/dlg_handlers.h
diff --git a/plugins/WhenWasIt/events.cpp b/plugins/WhenWasIt/src/events.cpp
index 70dc0ffee4..70dc0ffee4 100644
--- a/plugins/WhenWasIt/events.cpp
+++ b/plugins/WhenWasIt/src/events.cpp
diff --git a/plugins/WhenWasIt/events.h b/plugins/WhenWasIt/src/events.h
index 8d63e59630..8d63e59630 100644
--- a/plugins/WhenWasIt/events.h
+++ b/plugins/WhenWasIt/src/events.h
diff --git a/plugins/WhenWasIt/hooked_events.cpp b/plugins/WhenWasIt/src/hooked_events.cpp
index fda21c0aea..fda21c0aea 100644
--- a/plugins/WhenWasIt/hooked_events.cpp
+++ b/plugins/WhenWasIt/src/hooked_events.cpp
diff --git a/plugins/WhenWasIt/hooked_events.h b/plugins/WhenWasIt/src/hooked_events.h
index 69c75f0531..69c75f0531 100644
--- a/plugins/WhenWasIt/hooked_events.h
+++ b/plugins/WhenWasIt/src/hooked_events.h
diff --git a/plugins/WhenWasIt/icons.cpp b/plugins/WhenWasIt/src/icons.cpp
index 0b24c21442..0b24c21442 100644
--- a/plugins/WhenWasIt/icons.cpp
+++ b/plugins/WhenWasIt/src/icons.cpp
diff --git a/plugins/WhenWasIt/icons.h b/plugins/WhenWasIt/src/icons.h
index f9d85ce7a4..f9d85ce7a4 100644
--- a/plugins/WhenWasIt/icons.h
+++ b/plugins/WhenWasIt/src/icons.h
diff --git a/plugins/WhenWasIt/notifiers.cpp b/plugins/WhenWasIt/src/notifiers.cpp
index 102511cfaa..102511cfaa 100644
--- a/plugins/WhenWasIt/notifiers.cpp
+++ b/plugins/WhenWasIt/src/notifiers.cpp
diff --git a/plugins/WhenWasIt/notifiers.h b/plugins/WhenWasIt/src/notifiers.h
index db43ca55e1..db43ca55e1 100644
--- a/plugins/WhenWasIt/notifiers.h
+++ b/plugins/WhenWasIt/src/notifiers.h
diff --git a/plugins/WhenWasIt/resource.h b/plugins/WhenWasIt/src/resource.h
index e43831ac79..e43831ac79 100644
--- a/plugins/WhenWasIt/resource.h
+++ b/plugins/WhenWasIt/src/resource.h
diff --git a/plugins/WhenWasIt/services.cpp b/plugins/WhenWasIt/src/services.cpp
index adc06de7b5..adc06de7b5 100644
--- a/plugins/WhenWasIt/services.cpp
+++ b/plugins/WhenWasIt/src/services.cpp
diff --git a/plugins/WhenWasIt/services.h b/plugins/WhenWasIt/src/services.h
index 4348077a54..4348077a54 100644
--- a/plugins/WhenWasIt/services.h
+++ b/plugins/WhenWasIt/src/services.h
diff --git a/plugins/WhenWasIt/utils.cpp b/plugins/WhenWasIt/src/utils.cpp
index 6bfbcd326e..6bfbcd326e 100644
--- a/plugins/WhenWasIt/utils.cpp
+++ b/plugins/WhenWasIt/src/utils.cpp
diff --git a/plugins/WhenWasIt/utils.h b/plugins/WhenWasIt/src/utils.h
index 6d76c72d2a..6d76c72d2a 100644
--- a/plugins/WhenWasIt/utils.h
+++ b/plugins/WhenWasIt/src/utils.h
diff --git a/plugins/WhenWasIt/version.h b/plugins/WhenWasIt/src/version.h
index 73caab55c5..73caab55c5 100644
--- a/plugins/WhenWasIt/version.h
+++ b/plugins/WhenWasIt/src/version.h