From 8a4fb1972073344d54e9248660d813c93208c82a Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Thu, 17 May 2012 16:30:40 +0000 Subject: obsolete project files cleanup and overall adjustment: Part 5 git-svn-id: http://svn.miranda-ng.org/main/trunk@16 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/weather/m_weather.h | 161 -------------------------- protocols/weather/weather_10.sln | 12 ++ protocols/weather/weather_10.vcxproj | 218 ++++++++++++++++++++++++++++++++--- 3 files changed, 215 insertions(+), 176 deletions(-) delete mode 100644 protocols/weather/m_weather.h (limited to 'protocols') diff --git a/protocols/weather/m_weather.h b/protocols/weather/m_weather.h deleted file mode 100644 index dbdd1de298..0000000000 --- a/protocols/weather/m_weather.h +++ /dev/null @@ -1,161 +0,0 @@ -/* -Weather Protocol plugin for Miranda IM -Copyright (C) 2005-2009 Boris Krasnovskiy All Rights Reserved -Copyright (C) 2002-2005 Calvin Che - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#ifndef M_WEATHER_H__ -#define M_WEATHER_H__ 1 - -// {6B612A34-DCF2-4e32-85CF-B6FD006B745E} -#define MIID_WEATHER { 0x6b612a34, 0xdcf2, 0x4e32, { 0x85, 0xcf, 0xb6, 0xfd, 0x0, 0x6b, 0x74, 0x5e } } - -//============ CONSTANTS ============ - -// name -#define WEATHERPROTONAME "Weather" -#define WEATHERPROTOTEXT "Weather" -#define DEFCURRENTWEATHER "WeatherCondition" -#define WEATHERCONDITION "Current" - -// weather conditions -#define SUNNY ID_STATUS_ONLINE -#define NA ID_STATUS_OFFLINE -#define PCLOUDY ID_STATUS_AWAY -#define CLOUDY ID_STATUS_NA -#define RAIN ID_STATUS_OCCUPIED -#define RSHOWER ID_STATUS_DND -#define SNOW ID_STATUS_FREECHAT -#define LIGHT ID_STATUS_INVISIBLE -#define THUNDER ID_STATUS_INVISIBLE -#define SSHOWER ID_STATUS_ONTHEPHONE -#define FOG ID_STATUS_OUTTOLUNCH -#define UNAVAIL 40081 - - -//============ WEATHER CONDITION STRUCT ============ - -// weather conditions (added in v0.1.2.0) -typedef struct { - HANDLE hContact; - char id[128]; - char city[128]; - char update[64]; - char cond[128]; - char temp[16]; - char low[16]; - char high[16]; - char feel[16]; - char wind[16]; - char winddir[64]; - char dewpoint[16]; - char pressure[16]; - char humid[16]; - char vis[16]; - char sunrise[32]; - char sunset[32]; -// are the other ones that important!? - WORD status; -} WEATHERINFO; - - - -// =============== WEATHER SERVICES ================ - -// Enable or disable weather protocol. -// WPARAM = FALSE to toggle, TRUE to use the LPARAM -// LPARAM = TRUE to enable, FALSE to disable -#define MS_WEATHER_ENABLED "Weather/EnableDisable" - -// Update all weather info -// WPARAM = LPARAM = NULL -#define MS_WEATHER_UPDATEALL "Weather/UpdateAll" - -// Update all weather info + erase the old ones -// WPARAM = LPARAM = NULL -#define MS_WEATHER_REFRESHALL "Weather/RefreshAll" - -// Below are the service functions for weather contacts -// The plugin does NOT verify that they are used in weather contact, -// so bad call on these function may cause crashes. - -// Update a single station -// WPARAM = (HANDLE)hContact -// LPARAM = NULL -#define MS_WEATHER_UPDATE "Weather/Update" - -// Update a single station + delete old settings -// WPARAM = (HANDLE)hContact -// LPARAM = NULL -#define MS_WEATHER_REFRESH "Weather/Refresh" - -// View the brief info of a contact -// WPARAM = (HANDLE)hContact -// LPARAM = NULL -#define MS_WEATHER_BRIEF "Weather/Brief" - -// Use default browser to open the complete forecast on web -// WPARAM = (HANDLE)hContact -// LPARAM = NULL -#define MS_WEATHER_COMPLETE "Weather/CompleteForecast" - -// Use default browser to open the weather map defined for the contact -// WPARAM = (HANDLE)hContact -// LPARAM = NULL -#define MS_WEATHER_MAP "Weather/Map" - -// Open the external log of the weather contact -// WPARAM = (HANDLE)hContact -// LPARAM = NULL -#define MS_WEATHER_LOG "Weather/Log" - -// Edit weather contact setting -// WPARAM = (HANDLE)hContact -// LPARAM = NULL -#define MS_WEATHER_EDIT "Weather/Edit" - -// parse the string to turn it to weather display -// WPARAM = (WEATHERINFO*)hContact -// LPARAM = (char*)display_str -#define MS_WEATHER_GETDISPLAY "Weather/GetDisplay" - -// =============== WEATHER EVENTS ================ - -/* -HANDLE hContact = (HANDLE)wParam; -BOOL Condition_Changed = (BOOL)lParam; - -hContact is the handle of updated contact -If the weather condition is differ from the last update (either temperature/condition, -or the last update time, depend what the user choose in the options), then -Condition_Changed is true; otherwise is false. -*/ -#define ME_WEATHER_UPDATED "Miranda/Weather/Updated" - -/* -Shows a warning message for Weather PopUp. -wParam = (char*) lpzMessage -lParam = Type -Type can either be SM_WARNING, SM_NOTIFY, or SM_WEATHERALERT - -This event is used to avoid the error popup to occurs within a thread, so the "Use -multiply thread" fuction don't have to be enabled for weather popups to work. -*/ -#define SM_WEATHERALERT 16 -#define ME_WEATHER_ERROR "Miranda/Weather/Error" - - -#endif //M_WEATHER_H__ diff --git a/protocols/weather/weather_10.sln b/protocols/weather/weather_10.sln index 038ac8b9a7..a75e07a699 100644 --- a/protocols/weather/weather_10.sln +++ b/protocols/weather/weather_10.sln @@ -5,16 +5,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "weather_10.vcxpr EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug Unicode|Win32 = Debug Unicode|Win32 + Debug Unicode|x64 = Debug Unicode|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + Release Unicode|Win32 = Release Unicode|Win32 + Release Unicode|x64 = Release Unicode|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32 + {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32 + {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64 + {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug Unicode|x64.Build.0 = Debug Unicode|x64 {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|Win32.ActiveCfg = Debug|Win32 {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|Win32.Build.0 = Debug|Win32 {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|x64.ActiveCfg = Debug|x64 {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Debug|x64.Build.0 = Debug|x64 + {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32 + {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release Unicode|Win32.Build.0 = Release Unicode|Win32 + {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release Unicode|x64.ActiveCfg = Release Unicode|x64 + {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release Unicode|x64.Build.0 = Release Unicode|x64 {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|Win32.ActiveCfg = Release|Win32 {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|Win32.Build.0 = Release|Win32 {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}.Release|x64.ActiveCfg = Release|x64 diff --git a/protocols/weather/weather_10.vcxproj b/protocols/weather/weather_10.vcxproj index 03874bea4b..a0d5a79130 100644 --- a/protocols/weather/weather_10.vcxproj +++ b/protocols/weather/weather_10.vcxproj @@ -1,6 +1,14 @@  + + Debug Unicode + Win32 + + + Debug Unicode + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release Unicode + Win32 + + + Release Unicode + x64 + Release Win32 @@ -27,17 +43,31 @@ DynamicLibrary + + DynamicLibrary + DynamicLibrary true + + DynamicLibrary + true + DynamicLibrary + + DynamicLibrary + DynamicLibrary true + + DynamicLibrary + true + @@ -45,52 +75,85 @@ + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\Obj\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ true + true false - $(Configuration)64\ - $(Configuration)64\Obj\ + false + $(SolutionDir)$(Configuration)64/Plugins\ + $(SolutionDir)$(Configuration)64/Plugins\ + $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ true + true false - c:\Miranda IM\Plugins\ - $(Configuration)\Obj\ + false + $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ true + true true - c:\Miranda IM\Plugins\ - $(Configuration)64\Obj\ + true + $(SolutionDir)$(Configuration)64/Plugins\ + $(SolutionDir)$(Configuration)64/Plugins\ + $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ true + true true - $(Configuration)\ + true + $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Plugins\ E:\Sources\include;$(IncludePath) + E:\Sources\include;$(IncludePath) - MinSpace + Full OnlyExplicitInline true Size true true - ..\..\include;%(AdditionalIncludeDirectories) + ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true false - MultiThreaded + MultiThreadedDLL false true Fast @@ -110,16 +173,86 @@ 0x72030000 false MachineX86 + $(IntDir)$(TargetName).lib + + + + + Full + OnlyExplicitInline + true + Size + true + true + ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + false + MultiThreadedDLL + false + true + Fast + false + Level3 + weather.h + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir)weather.res + + + /ALIGN:4096 /filealign:0x200 /ignore:4108 %(AdditionalOptions) + %(AdditionalLibraryDirectories) + true + true + 0x72030000 + false + MachineX86 + $(IntDir)$(TargetName).lib - MinSpace + Full + OnlyExplicitInline + true + Size + true + ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + false + MultiThreadedDLL + false + true + Fast + false + weather.h + Level3 + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir)weather.res + + + /ALIGN:4096 /filealign:0x200 /ignore:4108 %(AdditionalOptions) + %(AdditionalLibraryDirectories) + true + true + 0x72030000 + false + MachineX64 + $(IntDir)$(TargetName).lib + + + + + Full OnlyExplicitInline true Size true - ..\..\miranda\miranda\include;%(AdditionalIncludeDirectories) + ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true false @@ -143,12 +276,13 @@ 0x72030000 false MachineX64 + $(IntDir)$(TargetName).lib Disabled - ..\..\include;%(AdditionalIncludeDirectories) + ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks true @@ -168,12 +302,65 @@ 0x72030000 false MachineX86 + $(IntDir)$(TargetName).lib + + + + + Disabled + ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + EnableFastChecks + true + MultiThreadedDebugDLL + true + weather.h + Level3 + EditAndContinue + + + $(IntDir)weather.res + + + wsock32.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + 0x72030000 + false + MachineX86 + $(IntDir)$(TargetName).lib Disabled - ..\..\miranda\miranda\include;%(AdditionalIncludeDirectories) + ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + Fast + weather.h + Level3 + ProgramDatabase + + + $(IntDir)weather.res + + + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + 0x72030000 + false + MachineX64 + $(IntDir)$(TargetName).lib + + + + + Disabled + ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -193,6 +380,7 @@ 0x72030000 false MachineX64 + $(IntDir)$(TargetName).lib -- cgit v1.2.3