Chat: changed folder structure

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

59 files changed, 79 insertions, 234 deletions

diff --git a/plugins/Chat/chat-translation.txt b/plugins/Chat/Docs/chat-translation.txt
index 24c8d5c97a..24c8d5c97a 100644
--- a/plugins/Chat/chat-translation.txt
+++ b/plugins/Chat/Docs/chat-translation.txt
diff --git a/plugins/Chat/chat_10.vcxproj b/plugins/Chat/chat_10.vcxproj
index bcb14cc438..347f026a18 100644
--- a/plugins/Chat/chat_10.vcxproj
+++ b/plugins/Chat/chat_10.vcxproj
@@ -211,73 +211,35 @@
     </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

-    <ClCompile Include="main.cpp">

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

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

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

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

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

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

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

-    <ClCompile Include="richutil.cpp">

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

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

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

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

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

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

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

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

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

   </ItemGroup>

   <ItemGroup>

-    <None Include="Icons\1.ico" />

-    <None Include="Icons\2.ico" />

-    <None Include="Icons\3.ico" />

-    <None Include="Icons\4.ico" />

-    <None Include="Icons\5.ico" />

-    <None Include="Icons\6.ico" />

-    <None Include="Icons\action.ico" />

-    <None Include="Icons\addmode.ico" />

-    <None Include="Icons\bkgcolor.ico" />

-    <None Include="Icons\blank.ico" />

-    <None Include="Icons\bold.ico" />

-    <None Include="Icons\close.ico" />

-    <None Include="Icons\color.ico" />

-    <None Include="Icons\filter.ico" />

-    <None Include="Icons\filter2.ico" />

-    <None Include="Icons\highlight.ico" />

-    <None Include="Icons\history.ico" />

-    <None Include="Icons\info.ico" />

-    <None Include="Icons\italics.ico" />

-    <None Include="Icons\join.ico" />

-    <None Include="Icons\kick.ico" />

-    <None Include="Icons\message.ico" />

-    <None Include="Icons\messageout.ico" />

-    <None Include="Icons\nick.ico" />

-    <None Include="Icons\nicklist.ico" />

-    <None Include="Icons\nicklist2.ico" />

-    <None Include="Icons\notice.ico" />

-    <None Include="Icons\overlay.ico" />

-    <None Include="Icons\part.ico" />

-    <None Include="Icons\quit.ico" />

-    <None Include="Icons\removestatus.ico" />

-    <None Include="Icons\smiley.ico" />

-    <None Include="Icons\tag1.ico" />

-    <None Include="Icons\tag2.ico" />

-    <None Include="Icons\topic.ico" />

-    <None Include="Icons\topicbut.ico" />

-    <None Include="Icons\underline.ico" />

-    <None Include="Icons\window.ico" />

-    <None Include="Docs\Chat_license.txt" />

-    <None Include="Docs\Chat_Readme.txt" />

-    <None Include="Docs\Chat_Translate.txt" />

+    <None Include="docs\Chat_license.txt" />

+    <None Include="docs\Chat_Readme.txt" />

+    <None Include="docs\Chat_Translate.txt" />

   </ItemGroup>

   <ItemGroup>

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

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

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/Chat/chat_10.vcxproj.filters b/plugins/Chat/chat_10.vcxproj.filters
index 7d33c0fb9f..f0744d306e 100644
--- a/plugins/Chat/chat_10.vcxproj.filters
+++ b/plugins/Chat/chat_10.vcxproj.filters
@@ -19,181 +19,67 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="clist.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="colorchooser.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="log.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="main.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="manager.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="message.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="richutil.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="services.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="tools.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="window.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="chat.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="richutil.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="Icons\1.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\2.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\3.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\4.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\5.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\6.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\action.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\addmode.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\bkgcolor.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\blank.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\bold.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\close.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\color.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\filter.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\filter2.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\highlight.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\history.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\info.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\italics.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\join.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\kick.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\message.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\messageout.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\nick.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\nicklist.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\nicklist2.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\notice.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\overlay.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\part.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\quit.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\removestatus.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\smiley.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\tag1.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\tag2.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\topic.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\topicbut.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\underline.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Icons\window.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Docs\Chat_license.txt">

+    <None Include="docs\Chat_license.txt">

       <Filter>Documentation</Filter>

     </None>

-    <None Include="Docs\Chat_Readme.txt">

+    <None Include="docs\Chat_Readme.txt">

       <Filter>Documentation</Filter>

     </None>

-    <None Include="Docs\Chat_Translate.txt">

+    <None Include="docs\Chat_Translate.txt">

       <Filter>Documentation</Filter>

     </None>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="Chat.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="version.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/Chat/Icons/1.ico b/plugins/Chat/res/1.ico
index 51dcdc4648..51dcdc4648 100644
--- a/plugins/Chat/Icons/1.ico
+++ b/plugins/Chat/res/1.ico
diff --git a/plugins/Chat/Icons/2.ico b/plugins/Chat/res/2.ico
index 819ecc1d7a..819ecc1d7a 100644
--- a/plugins/Chat/Icons/2.ico
+++ b/plugins/Chat/res/2.ico
diff --git a/plugins/Chat/Icons/3.ico b/plugins/Chat/res/3.ico
index 0928e257fe..0928e257fe 100644
--- a/plugins/Chat/Icons/3.ico
+++ b/plugins/Chat/res/3.ico
diff --git a/plugins/Chat/Icons/4.ico b/plugins/Chat/res/4.ico
index 5dcea114fa..5dcea114fa 100644
--- a/plugins/Chat/Icons/4.ico
+++ b/plugins/Chat/res/4.ico
diff --git a/plugins/Chat/Icons/5.ico b/plugins/Chat/res/5.ico
index 6aa5806c53..6aa5806c53 100644
--- a/plugins/Chat/Icons/5.ico
+++ b/plugins/Chat/res/5.ico
diff --git a/plugins/Chat/Icons/6.ico b/plugins/Chat/res/6.ico
index c35cc39ebc..c35cc39ebc 100644
--- a/plugins/Chat/Icons/6.ico
+++ b/plugins/Chat/res/6.ico
diff --git a/plugins/Chat/Icons/action.ico b/plugins/Chat/res/action.ico
index 44816c42d7..44816c42d7 100644
--- a/plugins/Chat/Icons/action.ico
+++ b/plugins/Chat/res/action.ico
diff --git a/plugins/Chat/Icons/addmode.ico b/plugins/Chat/res/addmode.ico
index a6a7e6f38c..a6a7e6f38c 100644
--- a/plugins/Chat/Icons/addmode.ico
+++ b/plugins/Chat/res/addmode.ico
diff --git a/plugins/Chat/Icons/bkgcolor.ico b/plugins/Chat/res/bkgcolor.ico
index e3322ef34b..e3322ef34b 100644
--- a/plugins/Chat/Icons/bkgcolor.ico
+++ b/plugins/Chat/res/bkgcolor.ico
diff --git a/plugins/Chat/Icons/blank.ico b/plugins/Chat/res/blank.ico
index 7845f62fed..7845f62fed 100644
--- a/plugins/Chat/Icons/blank.ico
+++ b/plugins/Chat/res/blank.ico
diff --git a/plugins/Chat/Icons/bold.ico b/plugins/Chat/res/bold.ico
index fc34113b6b..fc34113b6b 100644
--- a/plugins/Chat/Icons/bold.ico
+++ b/plugins/Chat/res/bold.ico
diff --git a/plugins/Chat/chat.rc b/plugins/Chat/res/chat.rc
index a42abf691e..f9d26f144b 100644
--- a/plugins/Chat/chat.rc
+++ b/plugins/Chat/res/chat.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -285,8 +285,8 @@ END
 

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

 // remains consistent on all systems.

-IDI_TAG1                ICON                    "Icons/tag1.ico"

-IDI_TAG2                ICON                    "Icons/tag2.ico"

+IDI_TAG1                ICON                    "tag1.ico"

+IDI_TAG2                ICON                    "tag2.ico"

 #endif    // Neutral (Default) resources

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

 

@@ -323,42 +323,42 @@ END
 

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

 // remains consistent on all systems.

-IDI_BUNDERLINE          ICON                    "Icons/underline.ico"

-IDI_BBOLD               ICON                    "Icons/bold.ico"

-IDI_BITALICS            ICON                    "Icons/italics.ico"

-IDI_BSMILEY             ICON                    "Icons/smiley.ico"

-IDI_JOIN                ICON                    "Icons/join.ico"

-IDI_TOPIC               ICON                    "Icons/topic.ico"

-IDI_ADDSTATUS           ICON                    "Icons/addmode.ico"

-IDI_INFO                ICON                    "Icons/info.ico"

-IDI_KICK                ICON                    "Icons/kick.ico"

-IDI_MESSAGE             ICON                    "Icons/message.ico"

-IDI_NICK                ICON                    "Icons/nick.ico"

-IDI_NOTICE              ICON                    "Icons/notice.ico"

-IDI_PART                ICON                    "Icons/part.ico"

-IDI_QUIT                ICON                    "Icons/quit.ico"

-IDI_REMSTATUS           ICON                    "Icons/removestatus.ico"

-IDI_HIGHLIGHT           ICON                    "Icons/highlight.ico"

-IDI_MESSAGEOUT          ICON                    "Icons/messageout.ico"

-IDI_ACTION              ICON                    "Icons/action.ico"

-IDI_TOPICBUT            ICON                    "Icons/topicbut.ico"

-IDI_BKGCOLOR            ICON                    "Icons/bkgcolor.ico"

-IDI_CHANMGR             ICON                    "Icons/window.ico"

-IDI_COLOR               ICON                    "Icons/color.ico"

-IDI_FILTER              ICON                    "Icons/filter.ico"

-IDI_HISTORY             ICON                    "Icons/history.ico"

-IDI_NICKLIST            ICON                    "Icons/nicklist.ico"

-IDI_BLANK               ICON                    "Icons/blank.ico"

-IDI_STATUS3             ICON                    "Icons/4.ico"

-IDI_STATUS2             ICON                    "Icons/3.ico"

-IDI_STATUS4             ICON                    "Icons/5.ico"

-IDI_STATUS1             ICON                    "Icons/2.ico"

-IDI_STATUS0             ICON                    "Icons/1.ico"

-IDI_STATUS5             ICON                    "Icons/6.ico"

-IDI_CLOSE               ICON                    "Icons/close.ico"

-IDI_OVERLAY             ICON                    "Icons/overlay.ico"

-IDI_NICKLIST2           ICON                    "Icons/nicklist2.ico"

-IDI_FILTER2             ICON                    "Icons/filter2.ico"

+IDI_BUNDERLINE          ICON                    "underline.ico"

+IDI_BBOLD               ICON                    "bold.ico"

+IDI_BITALICS            ICON                    "italics.ico"

+IDI_BSMILEY             ICON                    "smiley.ico"

+IDI_JOIN                ICON                    "join.ico"

+IDI_TOPIC               ICON                    "topic.ico"

+IDI_ADDSTATUS           ICON                    "addmode.ico"

+IDI_INFO                ICON                    "info.ico"

+IDI_KICK                ICON                    "kick.ico"

+IDI_MESSAGE             ICON                    "message.ico"

+IDI_NICK                ICON                    "nick.ico"

+IDI_NOTICE              ICON                    "notice.ico"

+IDI_PART                ICON                    "part.ico"

+IDI_QUIT                ICON                    "quit.ico"

+IDI_REMSTATUS           ICON                    "removestatus.ico"

+IDI_HIGHLIGHT           ICON                    "highlight.ico"

+IDI_MESSAGEOUT          ICON                    "messageout.ico"

+IDI_ACTION              ICON                    "action.ico"

+IDI_TOPICBUT            ICON                    "topicbut.ico"

+IDI_BKGCOLOR            ICON                    "bkgcolor.ico"

+IDI_CHANMGR             ICON                    "window.ico"

+IDI_COLOR               ICON                    "color.ico"

+IDI_FILTER              ICON                    "filter.ico"

+IDI_HISTORY             ICON                    "history.ico"

+IDI_NICKLIST            ICON                    "nicklist.ico"

+IDI_BLANK               ICON                    "blank.ico"

+IDI_STATUS3             ICON                    "4.ico"

+IDI_STATUS2             ICON                    "3.ico"

+IDI_STATUS4             ICON                    "5.ico"

+IDI_STATUS1             ICON                    "2.ico"

+IDI_STATUS0             ICON                    "1.ico"

+IDI_STATUS5             ICON                    "6.ico"

+IDI_CLOSE               ICON                    "close.ico"

+IDI_OVERLAY             ICON                    "overlay.ico"

+IDI_NICKLIST2           ICON                    "nicklist2.ico"

+IDI_FILTER2             ICON                    "filter2.ico"

 

 #ifdef APSTUDIO_INVOKED

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

@@ -368,7 +368,7 @@ IDI_FILTER2             ICON                    "Icons/filter2.ico"
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/Chat/Icons/close.ico b/plugins/Chat/res/close.ico
index 20f12dd61f..20f12dd61f 100644
--- a/plugins/Chat/Icons/close.ico
+++ b/plugins/Chat/res/close.ico
diff --git a/plugins/Chat/Icons/color.ico b/plugins/Chat/res/color.ico
index 689762edbb..689762edbb 100644
--- a/plugins/Chat/Icons/color.ico
+++ b/plugins/Chat/res/color.ico
diff --git a/plugins/Chat/Icons/filter.ico b/plugins/Chat/res/filter.ico
index 7c99edb58c..7c99edb58c 100644
--- a/plugins/Chat/Icons/filter.ico
+++ b/plugins/Chat/res/filter.ico
diff --git a/plugins/Chat/Icons/filter2.ico b/plugins/Chat/res/filter2.ico
index 701890522b..701890522b 100644
--- a/plugins/Chat/Icons/filter2.ico
+++ b/plugins/Chat/res/filter2.ico
diff --git a/plugins/Chat/Icons/highlight.ico b/plugins/Chat/res/highlight.ico
index 552c912eaa..552c912eaa 100644
--- a/plugins/Chat/Icons/highlight.ico
+++ b/plugins/Chat/res/highlight.ico
diff --git a/plugins/Chat/Icons/history.ico b/plugins/Chat/res/history.ico
index e757b93e54..e757b93e54 100644
--- a/plugins/Chat/Icons/history.ico
+++ b/plugins/Chat/res/history.ico
diff --git a/plugins/Chat/Icons/info.ico b/plugins/Chat/res/info.ico
index 1acdb7190b..1acdb7190b 100644
--- a/plugins/Chat/Icons/info.ico
+++ b/plugins/Chat/res/info.ico
diff --git a/plugins/Chat/Icons/italics.ico b/plugins/Chat/res/italics.ico
index 5c61422a71..5c61422a71 100644
--- a/plugins/Chat/Icons/italics.ico
+++ b/plugins/Chat/res/italics.ico
diff --git a/plugins/Chat/Icons/join.ico b/plugins/Chat/res/join.ico
index 151cd93211..151cd93211 100644
--- a/plugins/Chat/Icons/join.ico
+++ b/plugins/Chat/res/join.ico
diff --git a/plugins/Chat/Icons/kick.ico b/plugins/Chat/res/kick.ico
index c93e92dd77..c93e92dd77 100644
--- a/plugins/Chat/Icons/kick.ico
+++ b/plugins/Chat/res/kick.ico
diff --git a/plugins/Chat/Icons/message.ico b/plugins/Chat/res/message.ico
index 19957e4ac8..19957e4ac8 100644
--- a/plugins/Chat/Icons/message.ico
+++ b/plugins/Chat/res/message.ico
diff --git a/plugins/Chat/Icons/messageout.ico b/plugins/Chat/res/messageout.ico
index 637196b745..637196b745 100644
--- a/plugins/Chat/Icons/messageout.ico
+++ b/plugins/Chat/res/messageout.ico
diff --git a/plugins/Chat/Icons/nick.ico b/plugins/Chat/res/nick.ico
index 3f199ffd50..3f199ffd50 100644
--- a/plugins/Chat/Icons/nick.ico
+++ b/plugins/Chat/res/nick.ico
diff --git a/plugins/Chat/Icons/nicklist.ico b/plugins/Chat/res/nicklist.ico
index f2f611d6a4..f2f611d6a4 100644
--- a/plugins/Chat/Icons/nicklist.ico
+++ b/plugins/Chat/res/nicklist.ico
diff --git a/plugins/Chat/Icons/nicklist2.ico b/plugins/Chat/res/nicklist2.ico
index cba204fe5e..cba204fe5e 100644
--- a/plugins/Chat/Icons/nicklist2.ico
+++ b/plugins/Chat/res/nicklist2.ico
diff --git a/plugins/Chat/Icons/notice.ico b/plugins/Chat/res/notice.ico
index 1ba34d7244..1ba34d7244 100644
--- a/plugins/Chat/Icons/notice.ico
+++ b/plugins/Chat/res/notice.ico
diff --git a/plugins/Chat/Icons/overlay.ico b/plugins/Chat/res/overlay.ico
index 28742d898d..28742d898d 100644
--- a/plugins/Chat/Icons/overlay.ico
+++ b/plugins/Chat/res/overlay.ico
diff --git a/plugins/Chat/Icons/part.ico b/plugins/Chat/res/part.ico
index 39c24868aa..39c24868aa 100644
--- a/plugins/Chat/Icons/part.ico
+++ b/plugins/Chat/res/part.ico
diff --git a/plugins/Chat/Icons/quit.ico b/plugins/Chat/res/quit.ico
index d7fbdaf4b7..d7fbdaf4b7 100644
--- a/plugins/Chat/Icons/quit.ico
+++ b/plugins/Chat/res/quit.ico
diff --git a/plugins/Chat/Icons/removestatus.ico b/plugins/Chat/res/removestatus.ico
index ea3cef3fef..ea3cef3fef 100644
--- a/plugins/Chat/Icons/removestatus.ico
+++ b/plugins/Chat/res/removestatus.ico
diff --git a/plugins/Chat/Icons/smiley.ico b/plugins/Chat/res/smiley.ico
index e0d066ce33..e0d066ce33 100644
--- a/plugins/Chat/Icons/smiley.ico
+++ b/plugins/Chat/res/smiley.ico
diff --git a/plugins/Chat/Icons/smileyc.ico b/plugins/Chat/res/smileyc.ico
index d5b8ab0d28..d5b8ab0d28 100644
--- a/plugins/Chat/Icons/smileyc.ico
+++ b/plugins/Chat/res/smileyc.ico
diff --git a/plugins/Chat/Icons/tag1.ico b/plugins/Chat/res/tag1.ico
index 1dc687becd..1dc687becd 100644
--- a/plugins/Chat/Icons/tag1.ico
+++ b/plugins/Chat/res/tag1.ico
diff --git a/plugins/Chat/Icons/tag2.ico b/plugins/Chat/res/tag2.ico
index 4fac50a4c8..4fac50a4c8 100644
--- a/plugins/Chat/Icons/tag2.ico
+++ b/plugins/Chat/res/tag2.ico
diff --git a/plugins/Chat/Icons/topic.ico b/plugins/Chat/res/topic.ico
index e4bb7da7e0..e4bb7da7e0 100644
--- a/plugins/Chat/Icons/topic.ico
+++ b/plugins/Chat/res/topic.ico
diff --git a/plugins/Chat/Icons/topicbut.ico b/plugins/Chat/res/topicbut.ico
index ddb72fb8ca..ddb72fb8ca 100644
--- a/plugins/Chat/Icons/topicbut.ico
+++ b/plugins/Chat/res/topicbut.ico
diff --git a/plugins/Chat/Icons/underline.ico b/plugins/Chat/res/underline.ico
index 01cf64a36a..01cf64a36a 100644
--- a/plugins/Chat/Icons/underline.ico
+++ b/plugins/Chat/res/underline.ico
diff --git a/plugins/Chat/version.rc b/plugins/Chat/res/version.rc
index f44d7ac5ab..b03abd0fd3 100644
--- a/plugins/Chat/version.rc
+++ b/plugins/Chat/res/version.rc
@@ -2,10 +2,7 @@
 #error this file is not editable by Microsoft Visual C++

 #endif //APSTUDIO_INVOKED

 

-#include "version.h"

-#include "resource.h"

-#include "winres.h"

-#include "richedit.h"

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

 

 #ifdef _WIN32

 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

diff --git a/plugins/Chat/Icons/window.ico b/plugins/Chat/res/window.ico
index b2c9e0f7b1..b2c9e0f7b1 100644
--- a/plugins/Chat/Icons/window.ico
+++ b/plugins/Chat/res/window.ico
diff --git a/plugins/Chat/chat.h b/plugins/Chat/src/chat.h
index f8130358aa..f8130358aa 100644
--- a/plugins/Chat/chat.h
+++ b/plugins/Chat/src/chat.h
diff --git a/plugins/Chat/clist.cpp b/plugins/Chat/src/clist.cpp
index df60f1de3a..df60f1de3a 100644
--- a/plugins/Chat/clist.cpp
+++ b/plugins/Chat/src/clist.cpp
diff --git a/plugins/Chat/colorchooser.cpp b/plugins/Chat/src/colorchooser.cpp
index 0d2642165f..0d2642165f 100644
--- a/plugins/Chat/colorchooser.cpp
+++ b/plugins/Chat/src/colorchooser.cpp
diff --git a/plugins/Chat/log.cpp b/plugins/Chat/src/log.cpp
index 86b2f41b0a..86b2f41b0a 100644
--- a/plugins/Chat/log.cpp
+++ b/plugins/Chat/src/log.cpp
diff --git a/plugins/Chat/main.cpp b/plugins/Chat/src/main.cpp
index ef631c5508..ef631c5508 100644
--- a/plugins/Chat/main.cpp
+++ b/plugins/Chat/src/main.cpp
diff --git a/plugins/Chat/manager.cpp b/plugins/Chat/src/manager.cpp
index 02a0f76a59..02a0f76a59 100644
--- a/plugins/Chat/manager.cpp
+++ b/plugins/Chat/src/manager.cpp
diff --git a/plugins/Chat/message.cpp b/plugins/Chat/src/message.cpp
index ce76bfc6f5..ce76bfc6f5 100644
--- a/plugins/Chat/message.cpp
+++ b/plugins/Chat/src/message.cpp
diff --git a/plugins/Chat/options.cpp b/plugins/Chat/src/options.cpp
index 381054d5ca..381054d5ca 100644
--- a/plugins/Chat/options.cpp
+++ b/plugins/Chat/src/options.cpp
diff --git a/plugins/Chat/resource.h b/plugins/Chat/src/resource.h
index f95fa7dd01..f95fa7dd01 100644
--- a/plugins/Chat/resource.h
+++ b/plugins/Chat/src/resource.h
diff --git a/plugins/Chat/richutil.cpp b/plugins/Chat/src/richutil.cpp
index 1c5143b17c..1c5143b17c 100644
--- a/plugins/Chat/richutil.cpp
+++ b/plugins/Chat/src/richutil.cpp
diff --git a/plugins/Chat/richutil.h b/plugins/Chat/src/richutil.h
index dff6a53915..dff6a53915 100644
--- a/plugins/Chat/richutil.h
+++ b/plugins/Chat/src/richutil.h
diff --git a/plugins/Chat/services.cpp b/plugins/Chat/src/services.cpp
index 06e4f20cc8..06e4f20cc8 100644
--- a/plugins/Chat/services.cpp
+++ b/plugins/Chat/src/services.cpp
diff --git a/plugins/Chat/tools.cpp b/plugins/Chat/src/tools.cpp
index fa8f28ead3..fa8f28ead3 100644
--- a/plugins/Chat/tools.cpp
+++ b/plugins/Chat/src/tools.cpp
diff --git a/plugins/Chat/version.h b/plugins/Chat/src/version.h
index 2d10138fcf..2d10138fcf 100644
--- a/plugins/Chat/version.h
+++ b/plugins/Chat/src/version.h
diff --git a/plugins/Chat/window.cpp b/plugins/Chat/src/window.cpp
index 2bb493ca49..2bb493ca49 100644
--- a/plugins/Chat/window.cpp
+++ b/plugins/Chat/src/window.cpp