NewsAggregator: folders restructurization

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

17 files changed, 22 insertions, 46 deletions

diff --git a/protocols/NewsAggregator/NewsAggregator_10.vcxproj b/protocols/NewsAggregator/NewsAggregator_10.vcxproj
index be32a6fab0..b4e0fc9c7a 100644
--- a/protocols/NewsAggregator/NewsAggregator_10.vcxproj
+++ b/protocols/NewsAggregator/NewsAggregator_10.vcxproj
@@ -173,13 +173,13 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

   </ItemGroup>

   <ItemGroup>

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

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

     <ClInclude Include="Src\Common.h" />

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

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

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="Src\Icons.cpp" />

@@ -192,13 +192,6 @@
     <ClCompile Include="Src\Update.cpp" />

     <ClCompile Include="Src\Utils.cpp" />

   </ItemGroup>

-  <ItemGroup>

-    <None Include="res\AddFeed.ico" />

-    <None Include="res\CheckAll.ico" />

-    <None Include="res\Export.ico" />

-    <None Include="res\Import.ico" />

-    <None Include="res\Main.ico" />

-  </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

diff --git a/protocols/NewsAggregator/NewsAggregator_10.vcxproj.filters b/protocols/NewsAggregator/NewsAggregator_10.vcxproj.filters
index 7869f699f9..758967e47d 100644
--- a/protocols/NewsAggregator/NewsAggregator_10.vcxproj.filters
+++ b/protocols/NewsAggregator/NewsAggregator_10.vcxproj.filters
@@ -15,21 +15,21 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="Version.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="Resource.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="Version.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="Src\Common.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

@@ -56,21 +56,4 @@
       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

-  <ItemGroup>

-    <None Include="res\Main.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\CheckAll.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\AddFeed.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\Import.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\Export.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/NewsAggregator/Resource.rc b/protocols/NewsAggregator/Res/Resource.rc
index a092bb26ea..ccfef31466 100644
--- a/protocols/NewsAggregator/Resource.rc
+++ b/protocols/NewsAggregator/Res/Resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -26,11 +26,11 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 

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

 // remains consistent on all systems.

-IDI_ICON                ICON                    "res/Main.ico"

-IDI_CHECKALL            ICON                    "res/CheckAll.ico"

-IDI_ADDFEED             ICON                    "res/AddFeed.ico"

-IDI_IMPORTFEEDS         ICON                    "res/Import.ico"

-IDI_EXPORTFEEDS         ICON                    "res/Export.ico"

+IDI_ICON                ICON                    "Main.ico"

+IDI_CHECKALL            ICON                    "CheckAll.ico"

+IDI_ADDFEED             ICON                    "AddFeed.ico"

+IDI_IMPORTFEEDS         ICON                    "Import.ico"

+IDI_EXPORTFEEDS         ICON                    "Export.ico"

 

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

 //

@@ -91,7 +91,7 @@ END
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

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

 END

 

 2 TEXTINCLUDE 

diff --git a/protocols/NewsAggregator/Version.rc b/protocols/NewsAggregator/Res/Version.rc
index d1da5e8d6a..d741488c4f 100644
--- a/protocols/NewsAggregator/Version.rc
+++ b/protocols/NewsAggregator/Res/Version.rc
@@ -5,7 +5,7 @@
 #endif //APSTUDIO_INVOKED

 

 #include "afxres.h"

-#include "version.h"

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

 

 #ifdef _WIN32

 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

diff --git a/protocols/NewsAggregator/Src/Common.h b/protocols/NewsAggregator/Src/Common.h
index 470ee91f0e..953229080d 100644
--- a/protocols/NewsAggregator/Src/Common.h
+++ b/protocols/NewsAggregator/Src/Common.h
@@ -55,8 +55,8 @@ Boston, MA 02111-1307, USA.
 #include <m_folders.h>

 #include <m_popup.h>

 

-#include "..\version.h"

-#include "..\resource.h"

+#include "version.h"

+#include "resource.h"

 

 #define MODULE	"NewsAggr"

 #define TAGSHELP "#<title># - The title of the item.\r\n#<description># - The item synopsis.\r\n#<link># - The URL of the item.\r\n#<author># - Email address of the author of the item.\r\n#<comments># - URL of a page for comments relating to the item.\r\n#<guid># - A string that uniquely identifies the item.\r\n#<category># - Specify one or more categories that the item belongs to."

diff --git a/protocols/NewsAggregator/Version.h b/protocols/NewsAggregator/Src/Version.h
index 7d4efa3d9d..7d4efa3d9d 100644
--- a/protocols/NewsAggregator/Version.h
+++ b/protocols/NewsAggregator/Src/Version.h
diff --git a/protocols/NewsAggregator/resource.h b/protocols/NewsAggregator/Src/resource.h
index f243b95585..f243b95585 100644
--- a/protocols/NewsAggregator/resource.h
+++ b/protocols/NewsAggregator/Src/resource.h
diff --git a/protocols/NewsAggregator/AtomText.txt b/protocols/NewsAggregator/docs/AtomText.txt
index 052516a6bb..052516a6bb 100644
--- a/protocols/NewsAggregator/AtomText.txt
+++ b/protocols/NewsAggregator/docs/AtomText.txt
diff --git a/protocols/NewsAggregator/RssText.txt b/protocols/NewsAggregator/docs/RssText.txt
index b229fc9e78..b229fc9e78 100644
--- a/protocols/NewsAggregator/RssText.txt
+++ b/protocols/NewsAggregator/docs/RssText.txt
diff --git a/protocols/NewsAggregator/ToDo.txt b/protocols/NewsAggregator/docs/ToDo.txt
index fa08c1a5f3..fa08c1a5f3 100644
--- a/protocols/NewsAggregator/ToDo.txt
+++ b/protocols/NewsAggregator/docs/ToDo.txt
diff --git a/protocols/NewsAggregator/newsaggregator-translation.txt b/protocols/NewsAggregator/docs/newsaggregator-translation.txt
index 6309234bcd..6309234bcd 100644
--- a/protocols/NewsAggregator/newsaggregator-translation.txt
+++ b/protocols/NewsAggregator/docs/newsaggregator-translation.txt
diff --git a/protocols/NewsAggregator/proto_newsaggr/Proto_NewsAggr.vcxproj b/protocols/NewsAggregator/proto_newsaggr/Proto_NewsAggr.vcxproj
index 83216615d4..0b4c2702ce 100644
--- a/protocols/NewsAggregator/proto_newsaggr/Proto_NewsAggr.vcxproj
+++ b/protocols/NewsAggregator/proto_newsaggr/Proto_NewsAggr.vcxproj
@@ -119,10 +119,10 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

   </ItemGroup>

   <ItemGroup>

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

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/protocols/NewsAggregator/proto_newsaggr/Proto_NewsAggr.vcxproj.filters b/protocols/NewsAggregator/proto_newsaggr/Proto_NewsAggr.vcxproj.filters
index d28e63c4b7..e32e34e0dc 100644
--- a/protocols/NewsAggregator/proto_newsaggr/Proto_NewsAggr.vcxproj.filters
+++ b/protocols/NewsAggregator/proto_newsaggr/Proto_NewsAggr.vcxproj.filters
@@ -11,12 +11,12 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="Proto_NewsAggr.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/protocols/NewsAggregator/proto_newsaggr/icos/Offline.ico b/protocols/NewsAggregator/proto_newsaggr/res/Offline.ico
index 91788e73e7..91788e73e7 100644
--- a/protocols/NewsAggregator/proto_newsaggr/icos/Offline.ico
+++ b/protocols/NewsAggregator/proto_newsaggr/res/Offline.ico
diff --git a/protocols/NewsAggregator/proto_newsaggr/icos/Online.ico b/protocols/NewsAggregator/proto_newsaggr/res/Online.ico
index 3629737fda..3629737fda 100644
--- a/protocols/NewsAggregator/proto_newsaggr/icos/Online.ico
+++ b/protocols/NewsAggregator/proto_newsaggr/res/Online.ico
diff --git a/protocols/NewsAggregator/proto_newsaggr/Proto_NewsAggr.rc b/protocols/NewsAggregator/proto_newsaggr/res/Proto_NewsAggr.rc
index 7edaa5f3df..3eaac4e99b 100644
--- a/protocols/NewsAggregator/proto_newsaggr/Proto_NewsAggr.rc
+++ b/protocols/NewsAggregator/proto_newsaggr/res/Proto_NewsAggr.rc
diff --git a/protocols/NewsAggregator/proto_newsaggr/resource.h b/protocols/NewsAggregator/proto_newsaggr/src/resource.h
index c6b804fd4e..c6b804fd4e 100644
--- a/protocols/NewsAggregator/proto_newsaggr/resource.h
+++ b/protocols/NewsAggregator/proto_newsaggr/src/resource.h