Weather: folders restructurization

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

14 files changed, 12 insertions, 98 deletions

diff --git a/protocols/Weather/proto_weather/proto_weather_10.vcxproj b/protocols/Weather/proto_weather/proto_weather_10.vcxproj
index f100b68085..8187912e95 100644
--- a/protocols/Weather/proto_weather/proto_weather_10.vcxproj
+++ b/protocols/Weather/proto_weather/proto_weather_10.vcxproj
@@ -120,22 +120,7 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

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

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="wicons\Cloud.ico" />

-    <None Include="wicons\FOG.ico" />

-    <None Include="wicons\LIGHT.ICO" />

-    <None Include="wicons\NA.ico" />

-    <None Include="wicons\PCLOUDY.ico" />

-    <None Include="wicons\RAIN.ico" />

-    <None Include="wicons\RSHOWER.ico" />

-    <None Include="wicons\SNOW.ICO" />

-    <None Include="wicons\SSHOWER.ico" />

-    <None Include="wicons\SUN.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/protocols/Weather/proto_weather/proto_weather_10.vcxproj.filters b/protocols/Weather/proto_weather/proto_weather_10.vcxproj.filters
index a94cf28821..27e90fab59 100644
--- a/protocols/Weather/proto_weather/proto_weather_10.vcxproj.filters
+++ b/protocols/Weather/proto_weather/proto_weather_10.vcxproj.filters
@@ -1,58 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

-    </Filter>

     <Filter Include="Resource Files">

       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>

     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="resource.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="wicons\Cloud.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\FOG.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\LIGHT.ICO">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\NA.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\PCLOUDY.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\RAIN.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\RSHOWER.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\SNOW.ICO">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\SSHOWER.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="wicons\SUN.ICO">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="resource.rc">

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/protocols/Weather/proto_weather/wicons/Cloud.ico b/protocols/Weather/proto_weather/res/Cloud.ico
index 2edb539dcb..2edb539dcb 100644
--- a/protocols/Weather/proto_weather/wicons/Cloud.ico
+++ b/protocols/Weather/proto_weather/res/Cloud.ico
diff --git a/protocols/Weather/proto_weather/wicons/FOG.ico b/protocols/Weather/proto_weather/res/FOG.ico
index fbd81b9a03..fbd81b9a03 100644
--- a/protocols/Weather/proto_weather/wicons/FOG.ico
+++ b/protocols/Weather/proto_weather/res/FOG.ico
diff --git a/protocols/Weather/proto_weather/wicons/LIGHT.ICO b/protocols/Weather/proto_weather/res/LIGHT.ico
index d266094fbe..d266094fbe 100644
--- a/protocols/Weather/proto_weather/wicons/LIGHT.ICO
+++ b/protocols/Weather/proto_weather/res/LIGHT.ico
diff --git a/protocols/Weather/proto_weather/wicons/NA.ico b/protocols/Weather/proto_weather/res/NA.ico
index 3e4a3aa324..3e4a3aa324 100644
--- a/protocols/Weather/proto_weather/wicons/NA.ico
+++ b/protocols/Weather/proto_weather/res/NA.ico
diff --git a/protocols/Weather/proto_weather/wicons/PCLOUDY.ico b/protocols/Weather/proto_weather/res/PCLOUDY.ico
index be3d0c88bd..be3d0c88bd 100644
--- a/protocols/Weather/proto_weather/wicons/PCLOUDY.ico
+++ b/protocols/Weather/proto_weather/res/PCLOUDY.ico
diff --git a/protocols/Weather/proto_weather/wicons/RAIN.ico b/protocols/Weather/proto_weather/res/RAIN.ico
index 4b65fb6714..4b65fb6714 100644
--- a/protocols/Weather/proto_weather/wicons/RAIN.ico
+++ b/protocols/Weather/proto_weather/res/RAIN.ico
diff --git a/protocols/Weather/proto_weather/wicons/RSHOWER.ico b/protocols/Weather/proto_weather/res/RSHOWER.ico
index 442552e155..442552e155 100644
--- a/protocols/Weather/proto_weather/wicons/RSHOWER.ico
+++ b/protocols/Weather/proto_weather/res/RSHOWER.ico
diff --git a/protocols/Weather/proto_weather/wicons/SNOW.ICO b/protocols/Weather/proto_weather/res/SNOW.ico
index 1a482c3bc8..1a482c3bc8 100644
--- a/protocols/Weather/proto_weather/wicons/SNOW.ICO
+++ b/protocols/Weather/proto_weather/res/SNOW.ico
diff --git a/protocols/Weather/proto_weather/wicons/SSHOWER.ico b/protocols/Weather/proto_weather/res/SSHOWER.ico
index 0bd2264413..0bd2264413 100644
--- a/protocols/Weather/proto_weather/wicons/SSHOWER.ico
+++ b/protocols/Weather/proto_weather/res/SSHOWER.ico
diff --git a/protocols/Weather/proto_weather/wicons/SUN.ICO b/protocols/Weather/proto_weather/res/SUN.ico
index b37fc6ad2a..b37fc6ad2a 100644
--- a/protocols/Weather/proto_weather/wicons/SUN.ICO
+++ b/protocols/Weather/proto_weather/res/SUN.ico
diff --git a/protocols/Weather/proto_weather/resource.rc b/protocols/Weather/proto_weather/res/resource.rc
index 930886b96f..b059c0696d 100644
--- a/protocols/Weather/proto_weather/resource.rc
+++ b/protocols/Weather/proto_weather/res/resource.rc
@@ -26,16 +26,16 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 

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

 // remains consistent on all systems.

-104                     ICON    DISCARDABLE     "wicons\\SUN.ico"

-105                     ICON    DISCARDABLE     "wicons\\NA.ico"

-128                     ICON    DISCARDABLE     "wicons\\PCLOUDY.ico"

-129                     ICON    DISCARDABLE     "wicons\\RSHOWER.ico"

-130                     ICON    DISCARDABLE     "wicons\\LIGHT.ico"

-131                     ICON    DISCARDABLE     "wicons\\RAIN.ico"

-158                     ICON    DISCARDABLE     "wicons\\SNOW.ico"

-159                     ICON    DISCARDABLE     "wicons\\CLOUD.ico"

-1002                    ICON    DISCARDABLE     "wicons\\SSHOWER.ico"

-1003                    ICON    DISCARDABLE     "wicons\\FOG.ico"

+104                     ICON         "SUN.ico"

+105                     ICON         "NA.ico"

+128                     ICON         "PCLOUDY.ico"

+129                     ICON         "RSHOWER.ico"

+130                     ICON         "LIGHT.ico"

+131                     ICON         "RAIN.ico"

+158                     ICON         "SNOW.ico"

+159                     ICON         "CLOUD.ico"

+1002                    ICON         "SSHOWER.ico"

+1003                    ICON         "FOG.ico"

 

 #endif    // English (U.S.) resources

 /////////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/protocols/Weather/proto_weather/resource.h b/protocols/Weather/proto_weather/resource.h
deleted file mode 100644
index 0ac64a0f1c..0000000000
--- a/protocols/Weather/proto_weather/resource.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//{{NO_DEPENDENCIES}}

-// Microsoft Visual C++ generated include file.

-// Used by resource.rc

-//

-#define IDI_ONLINE                      104

-#define IDI_OFFLINE                     105

-#define IDI_AWAY                        128

-#define IDI_FREE4CHAT                   129

-#define IDI_INVISIBLE                   130

-#define IDI_NA                          131

-#define IDI_DND                         158

-#define IDI_OCCUPIED                    159

-#define IDI_ONTHEPHONE                  1002

-#define IDI_OUTTOLUNCH                  1003

-

-// Next default values for new objects

-// 

-#ifdef APSTUDIO_INVOKED

-#ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NO_MFC                     1

-#define _APS_NEXT_RESOURCE_VALUE        224

-#define _APS_NEXT_COMMAND_VALUE         40030

-#define _APS_NEXT_CONTROL_VALUE         2117

-#define _APS_NEXT_SYMED_VALUE           101

-#endif

-#endif