folders structure standartization

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

18 files changed, 39 insertions, 34 deletions

diff --git a/plugins/Clist_modern/icons_pack/ICONS_10.vcxproj b/plugins/Clist_modern/icons_pack/ICONS_10.vcxproj
index 2d820113bc..775b1d22a2 100644
--- a/plugins/Clist_modern/icons_pack/ICONS_10.vcxproj
+++ b/plugins/Clist_modern/icons_pack/ICONS_10.vcxproj
@@ -116,26 +116,10 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

   </ItemGroup>

   <ItemGroup>

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

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="icos\icon_accmgr.ico" />

-    <None Include="icos\icon_bookmarks.ico" />

-    <None Include="icos\icon_dbeditor.ico" />

-    <None Include="icos\icon_find_user.ico" />

-    <None Include="icos\icon_groups_off.ico" />

-    <None Include="icos\icon_groups_on.ico" />

-    <None Include="icos\icon_hideoffline.ico" />

-    <None Include="icos\icon_mainmenu.ico" />

-    <None Include="icos\icon_minimize.ico" />

-    <None Include="icos\icon_options.ico" />

-    <None Include="icos\icon_showoffline.ico" />

-    <None Include="icos\icon_sounds_off.ico" />

-    <None Include="icos\icon_sounds_on.ico" />

-    <None Include="icos\icon_statusmenu.ico" />

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/Clist_modern/icons_pack/ICONS_10.vcxproj.filters b/plugins/Clist_modern/icons_pack/ICONS_10.vcxproj.filters
new file mode 100644
index 0000000000..d26234381b
--- /dev/null
+++ b/plugins/Clist_modern/icons_pack/ICONS_10.vcxproj.filters
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>

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

+  <ItemGroup>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{f1b96cfc-dc8e-4aa8-befb-e1880977cc87}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{3377fe20-cef7-43d8-98c4-13a468fed128}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

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

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/plugins/Clist_modern/icons_pack/ICONS.rc b/plugins/Clist_modern/icons_pack/res/ICONS.rc
index 287d4d44f5..81ff1c381a 100644
--- a/plugins/Clist_modern/icons_pack/ICONS.rc
+++ b/plugins/Clist_modern/icons_pack/res/ICONS.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.

 //

-#include "icon_resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

@@ -28,21 +28,21 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.                  

                     

-IDI_MAINMENU         ICON    DISCARDABLE     "icos/icon_mainmenu.ico"

-IDI_STATUSMENU       ICON    DISCARDABLE     "icos/icon_statusmenu.ico"

-IDI_HIDEOFFLINE      ICON    DISCARDABLE     "icos/icon_hideoffline.ico"

-IDI_SHOWOFFLINE      ICON    DISCARDABLE     "icos/icon_showoffline.ico"

-IDI_BOOKMARKS        ICON    DISCARDABLE     "icos/icon_bookmarks.ico"

-IDI_DBEDITOR         ICON    DISCARDABLE     "icos/icon_dbeditor.ico"

-IDI_FINDUSER         ICON    DISCARDABLE     "icos/icon_find_user.ico"

-IDI_OPTIONS          ICON    DISCARDABLE     "icos/icon_options.ico"

-

-IDI_GROUPS_ON        ICON    DISCARDABLE     "icos/icon_groups_on.ico"

-IDI_GROUPS_OFF       ICON    DISCARDABLE     "icos/icon_groups_off.ico"

-IDI_SOUNDS_ON        ICON    DISCARDABLE     "icos/icon_sounds_on.ico"

-IDI_SOUNDS_OFF       ICON    DISCARDABLE     "icos/icon_sounds_off.ico"

-IDI_MINIMIZE         ICON    DISCARDABLE     "icos/icon_minimize.ico"

-IDI_ACCMGR           ICON    DISCARDABLE     "icos/icon_accmgr.ico"

+IDI_MAINMENU         ICON         "icon_mainmenu.ico"

+IDI_STATUSMENU       ICON         "icon_statusmenu.ico"

+IDI_HIDEOFFLINE      ICON         "icon_hideoffline.ico"

+IDI_SHOWOFFLINE      ICON         "icon_showoffline.ico"

+IDI_BOOKMARKS        ICON         "icon_bookmarks.ico"

+IDI_DBEDITOR         ICON         "icon_dbeditor.ico"

+IDI_FINDUSER         ICON         "icon_find_user.ico"

+IDI_OPTIONS          ICON         "icon_options.ico"

+

+IDI_GROUPS_ON        ICON         "icon_groups_on.ico"

+IDI_GROUPS_OFF       ICON         "icon_groups_off.ico"

+IDI_SOUNDS_ON        ICON         "icon_sounds_on.ico"

+IDI_SOUNDS_OFF       ICON         "icon_sounds_off.ico"

+IDI_MINIMIZE         ICON         "icon_minimize.ico"

+IDI_ACCMGR           ICON         "icon_accmgr.ico"

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

 //

 // String Table

diff --git a/plugins/Clist_modern/icons_pack/icos/icon_accmgr.ico b/plugins/Clist_modern/icons_pack/res/icon_accmgr.ico
index 47169d588d..47169d588d 100644
--- a/plugins/Clist_modern/icons_pack/icos/icon_accmgr.ico
+++ b/plugins/Clist_modern/icons_pack/res/icon_accmgr.ico
diff --git a/plugins/Clist_modern/icons_pack/icos/icon_bookmarks.ico b/plugins/Clist_modern/icons_pack/res/icon_bookmarks.ico
index 469090ed61..469090ed61 100644
--- a/plugins/Clist_modern/icons_pack/icos/icon_bookmarks.ico
+++ b/plugins/Clist_modern/icons_pack/res/icon_bookmarks.ico
diff --git a/plugins/Clist_modern/icons_pack/icos/icon_dbeditor.ico b/plugins/Clist_modern/icons_pack/res/icon_dbeditor.ico
index 4218d610f5..4218d610f5 100644
--- a/plugins/Clist_modern/icons_pack/icos/icon_dbeditor.ico
+++ b/plugins/Clist_modern/icons_pack/res/icon_dbeditor.ico
diff --git a/plugins/Clist_modern/icons_pack/icos/icon_find_user.ico b/plugins/Clist_modern/icons_pack/res/icon_find_user.ico
index 2091d72960..2091d72960 100644
--- a/plugins/Clist_modern/icons_pack/icos/icon_find_user.ico
+++ b/plugins/Clist_modern/icons_pack/res/icon_find_user.ico
diff --git a/plugins/Clist_modern/icons_pack/icos/icon_groups_off.ico b/plugins/Clist_modern/icons_pack/res/icon_groups_off.ico
index 6baf9d9d3d..6baf9d9d3d 100644
--- a/plugins/Clist_modern/icons_pack/icos/icon_groups_off.ico
+++ b/plugins/Clist_modern/icons_pack/res/icon_groups_off.ico
diff --git a/plugins/Clist_modern/icons_pack/icos/icon_groups_on.ico b/plugins/Clist_modern/icons_pack/res/icon_groups_on.ico
index 9416f143f7..9416f143f7 100644
--- a/plugins/Clist_modern/icons_pack/icos/icon_groups_on.ico
+++ b/plugins/Clist_modern/icons_pack/res/icon_groups_on.ico
diff --git a/plugins/Clist_modern/icons_pack/icos/icon_hideoffline.ico b/plugins/Clist_modern/icons_pack/res/icon_hideoffline.ico
index 428ffc68e8..428ffc68e8 100644
--- a/plugins/Clist_modern/icons_pack/icos/icon_hideoffline.ico
+++ b/plugins/Clist_modern/icons_pack/res/icon_hideoffline.ico
diff --git a/plugins/Clist_modern/icons_pack/icos/icon_mainmenu.ico b/plugins/Clist_modern/icons_pack/res/icon_mainmenu.ico
index 9945493669..9945493669 100644
--- a/plugins/Clist_modern/icons_pack/icos/icon_mainmenu.ico
+++ b/plugins/Clist_modern/icons_pack/res/icon_mainmenu.ico
diff --git a/plugins/Clist_modern/icons_pack/icos/icon_minimize.ico b/plugins/Clist_modern/icons_pack/res/icon_minimize.ico
index f52668220b..f52668220b 100644
--- a/plugins/Clist_modern/icons_pack/icos/icon_minimize.ico
+++ b/plugins/Clist_modern/icons_pack/res/icon_minimize.ico
diff --git a/plugins/Clist_modern/icons_pack/icos/icon_options.ico b/plugins/Clist_modern/icons_pack/res/icon_options.ico
index 3529a5baf9..3529a5baf9 100644
--- a/plugins/Clist_modern/icons_pack/icos/icon_options.ico
+++ b/plugins/Clist_modern/icons_pack/res/icon_options.ico
diff --git a/plugins/Clist_modern/icons_pack/icos/icon_showoffline.ico b/plugins/Clist_modern/icons_pack/res/icon_showoffline.ico
index 70f8e21200..70f8e21200 100644
--- a/plugins/Clist_modern/icons_pack/icos/icon_showoffline.ico
+++ b/plugins/Clist_modern/icons_pack/res/icon_showoffline.ico
diff --git a/plugins/Clist_modern/icons_pack/icos/icon_sounds_off.ico b/plugins/Clist_modern/icons_pack/res/icon_sounds_off.ico
index a4d8f9093d..a4d8f9093d 100644
--- a/plugins/Clist_modern/icons_pack/icos/icon_sounds_off.ico
+++ b/plugins/Clist_modern/icons_pack/res/icon_sounds_off.ico
diff --git a/plugins/Clist_modern/icons_pack/icos/icon_sounds_on.ico b/plugins/Clist_modern/icons_pack/res/icon_sounds_on.ico
index 65c67c2386..65c67c2386 100644
--- a/plugins/Clist_modern/icons_pack/icos/icon_sounds_on.ico
+++ b/plugins/Clist_modern/icons_pack/res/icon_sounds_on.ico
diff --git a/plugins/Clist_modern/icons_pack/icos/icon_statusmenu.ico b/plugins/Clist_modern/icons_pack/res/icon_statusmenu.ico
index 44681552fd..44681552fd 100644
--- a/plugins/Clist_modern/icons_pack/icos/icon_statusmenu.ico
+++ b/plugins/Clist_modern/icons_pack/res/icon_statusmenu.ico
diff --git a/plugins/Clist_modern/icons_pack/icon_resource.h b/plugins/Clist_modern/icons_pack/src/icon_resource.h
index c9f5c0f94a..c9f5c0f94a 100644
--- a/plugins/Clist_modern/icons_pack/icon_resource.h
+++ b/plugins/Clist_modern/icons_pack/src/icon_resource.h