From 2e8f7b168189b3b5cac82a9f4c03a97273c26e59 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 1 Aug 2015 20:48:21 +0000 Subject: weather: common project git-svn-id: http://svn.miranda-ng.org/main/trunk@14799 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_dev.sln | 2 +- bin10/mir_full.sln | 2 +- bin10/mir_full_pro.sln | 2 +- bin10/mir_icons.sln | 2 +- bin12/mir_dev.sln | 2 +- bin12/mir_full.sln | 2 +- bin12/mir_icons.sln | 2 +- bin14/mir_dev.sln | 2 +- bin14/mir_full.sln | 2 +- bin14/mir_icons.sln | 2 +- .../Weather/proto_weather/proto_weather.vcxproj | 28 ++ .../proto_weather/proto_weather.vcxproj.filters | 4 + .../Weather/proto_weather/proto_weather_10.vcxproj | 128 ----- .../proto_weather/proto_weather_10.vcxproj.filters | 14 - .../Weather/proto_weather/proto_weather_12.vcxproj | 132 ----- .../proto_weather/proto_weather_12.vcxproj.filters | 14 - .../Weather/proto_weather/proto_weather_14.vcxproj | 132 ----- .../proto_weather/proto_weather_14.vcxproj.filters | 14 - plugins/Weather/src/stdafx.cpp | 18 - plugins/Weather/src/stdafx.cxx | 18 + plugins/Weather/src/stdafx.h | 550 ++++++++++++++++++++ plugins/Weather/src/weather.cpp | 2 +- plugins/Weather/src/weather.h | 552 --------------------- plugins/Weather/src/weather_addstn.cpp | 2 +- plugins/Weather/src/weather_contacts.cpp | 2 +- plugins/Weather/src/weather_conv.cpp | 2 +- plugins/Weather/src/weather_data.cpp | 2 +- plugins/Weather/src/weather_http.cpp | 2 +- plugins/Weather/src/weather_icons.cpp | 2 +- plugins/Weather/src/weather_info.cpp | 2 +- plugins/Weather/src/weather_ini.cpp | 2 +- plugins/Weather/src/weather_mwin.cpp | 2 +- plugins/Weather/src/weather_opt.cpp | 2 +- plugins/Weather/src/weather_popup.cpp | 2 +- plugins/Weather/src/weather_svcs.cpp | 2 +- plugins/Weather/src/weather_update.cpp | 2 +- plugins/Weather/src/weather_userinfo.cpp | 2 +- plugins/Weather/weather.vcxproj | 28 ++ plugins/Weather/weather.vcxproj.filters | 4 + plugins/Weather/weather_10.vcxproj | 221 --------- plugins/Weather/weather_10.vcxproj.filters | 86 ---- plugins/Weather/weather_12.vcxproj | 224 --------- plugins/Weather/weather_12.vcxproj.filters | 86 ---- plugins/Weather/weather_14.vcxproj | 224 --------- plugins/Weather/weather_14.vcxproj.filters | 86 ---- 45 files changed, 657 insertions(+), 1956 deletions(-) create mode 100644 plugins/Weather/proto_weather/proto_weather.vcxproj create mode 100644 plugins/Weather/proto_weather/proto_weather.vcxproj.filters delete mode 100644 plugins/Weather/proto_weather/proto_weather_10.vcxproj delete mode 100644 plugins/Weather/proto_weather/proto_weather_10.vcxproj.filters delete mode 100644 plugins/Weather/proto_weather/proto_weather_12.vcxproj delete mode 100644 plugins/Weather/proto_weather/proto_weather_12.vcxproj.filters delete mode 100644 plugins/Weather/proto_weather/proto_weather_14.vcxproj delete mode 100644 plugins/Weather/proto_weather/proto_weather_14.vcxproj.filters delete mode 100644 plugins/Weather/src/stdafx.cpp create mode 100644 plugins/Weather/src/stdafx.cxx create mode 100644 plugins/Weather/src/stdafx.h delete mode 100644 plugins/Weather/src/weather.h create mode 100644 plugins/Weather/weather.vcxproj create mode 100644 plugins/Weather/weather.vcxproj.filters delete mode 100644 plugins/Weather/weather_10.vcxproj delete mode 100644 plugins/Weather/weather_10.vcxproj.filters delete mode 100644 plugins/Weather/weather_12.vcxproj delete mode 100644 plugins/Weather/weather_12.vcxproj.filters delete mode 100644 plugins/Weather/weather_14.vcxproj delete mode 100644 plugins/Weather/weather_14.vcxproj.filters diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln index 8d8628c8e5..f8c72726b2 100644 --- a/bin10/mir_dev.sln +++ b/bin10/mir_dev.sln @@ -309,7 +309,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewsAggregator", "..\plugin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quotes", "..\plugins\Quotes\Forex.vcxproj", "{C619A811-8023-4441-B3D7-785388A09DF0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\plugins\Weather\weather_10.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\plugins\Weather\weather.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YAMN", "..\plugins\YAMN\YAMN_10.vcxproj", "{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}" EndProject diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index f54138bff9..b837d1754f 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -318,7 +318,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewsAggregator", "..\plugin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quotes", "..\plugins\Quotes\Forex.vcxproj", "{C619A811-8023-4441-B3D7-785388A09DF0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\plugins\Weather\weather_10.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\plugins\Weather\weather.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ping", "..\plugins\Ping\ping.vcxproj", "{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}" EndProject diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index 551fb79c5a..d2b37c00e8 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -350,7 +350,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YAMN", "..\plugins\YAMN\YAM EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewsAggregator", "..\plugins\NewsAggregator\NewsAggregator.vcxproj", "{6DE11A47-2268-4B08-8DE5-15A1705FCE28}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\plugins\Weather\weather_10.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\plugins\Weather\weather.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quotes", "..\plugins\Quotes\Forex.vcxproj", "{C619A811-8023-4441-B3D7-785388A09DF0}" EndProject diff --git a/bin10/mir_icons.sln b/bin10/mir_icons.sln index 0a30c0dbcd..3f298f54cb 100644 --- a/bin10/mir_icons.sln +++ b/bin10/mir_icons.sln @@ -58,7 +58,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_NewsAggregator", "..\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Quotes", "..\plugins\Quotes\proto_Quotes\proto_Quotes.vcxproj", "{5A0A9761-78E1-4E0F-AD8C-8931A667A5F2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Weather", "..\plugins\Weather\proto_weather\proto_weather_10.vcxproj", "{B2F4BA6C-1BD6-4A50-A706-DCBC6A5D439B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Weather", "..\plugins\Weather\proto_weather\proto_weather.vcxproj", "{B2F4BA6C-1BD6-4A50-A706-DCBC6A5D439B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_YAMN", "..\plugins\YAMN\proto_yamn\proto_YAMN_10.vcxproj", "{C1CDB82C-6BBF-496E-88F4-CC57E60B0CA9}" EndProject diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln index cd87f1e5f8..9a1a0bcf37 100644 --- a/bin12/mir_dev.sln +++ b/bin12/mir_dev.sln @@ -316,7 +316,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewsAggregator", "..\plugin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quotes", "..\plugins\Quotes\Forex.vcxproj", "{C619A811-8023-4441-B3D7-785388A09DF0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\plugins\Weather\weather_12.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\plugins\Weather\weather.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YAMN", "..\plugins\YAMN\YAMN_12.vcxproj", "{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}" EndProject diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln index 5f725638a2..1fd3cd0827 100644 --- a/bin12/mir_full.sln +++ b/bin12/mir_full.sln @@ -322,7 +322,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewsAggregator", "..\plugin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quotes", "..\plugins\Quotes\Forex.vcxproj", "{C619A811-8023-4441-B3D7-785388A09DF0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\plugins\Weather\weather_12.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\plugins\Weather\weather.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ping", "..\plugins\Ping\ping.vcxproj", "{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}" EndProject diff --git a/bin12/mir_icons.sln b/bin12/mir_icons.sln index e113293c33..c5500a6d87 100644 --- a/bin12/mir_icons.sln +++ b/bin12/mir_icons.sln @@ -58,7 +58,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_NewsAggregator", "..\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Quotes", "..\plugins\Quotes\proto_Quotes\proto_Quotes.vcxproj", "{5A0A9761-78E1-4E0F-AD8C-8931A667A5F2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Weather", "..\plugins\Weather\proto_weather\proto_weather_12.vcxproj", "{B2F4BA6C-1BD6-4A50-A706-DCBC6A5D439B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Weather", "..\plugins\Weather\proto_weather\proto_weather.vcxproj", "{B2F4BA6C-1BD6-4A50-A706-DCBC6A5D439B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_YAMN", "..\plugins\YAMN\proto_yamn\proto_YAMN_12.vcxproj", "{C1CDB82C-6BBF-496E-88F4-CC57E60B0CA9}" EndProject diff --git a/bin14/mir_dev.sln b/bin14/mir_dev.sln index 59863f98e3..4a8712b1d3 100644 --- a/bin14/mir_dev.sln +++ b/bin14/mir_dev.sln @@ -316,7 +316,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewsAggregator", "..\plugin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quotes", "..\plugins\Quotes\Forex.vcxproj", "{C619A811-8023-4441-B3D7-785388A09DF0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\plugins\Weather\weather_14.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\plugins\Weather\weather.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YAMN", "..\plugins\YAMN\YAMN_14.vcxproj", "{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}" EndProject diff --git a/bin14/mir_full.sln b/bin14/mir_full.sln index 1fed3b9e05..99b45684d1 100644 --- a/bin14/mir_full.sln +++ b/bin14/mir_full.sln @@ -322,7 +322,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewsAggregator", "..\plugin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quotes", "..\plugins\Quotes\Forex.vcxproj", "{C619A811-8023-4441-B3D7-785388A09DF0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\plugins\Weather\weather_14.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\plugins\Weather\weather.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ping", "..\plugins\Ping\ping.vcxproj", "{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}" EndProject diff --git a/bin14/mir_icons.sln b/bin14/mir_icons.sln index ae318da8a8..bad4bf003d 100644 --- a/bin14/mir_icons.sln +++ b/bin14/mir_icons.sln @@ -58,7 +58,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_NewsAggregator", "..\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Quotes", "..\plugins\Quotes\proto_Quotes\proto_Quotes.vcxproj", "{5A0A9761-78E1-4E0F-AD8C-8931A667A5F2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Weather", "..\plugins\Weather\proto_weather\proto_weather_14.vcxproj", "{B2F4BA6C-1BD6-4A50-A706-DCBC6A5D439B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Weather", "..\plugins\Weather\proto_weather\proto_weather.vcxproj", "{B2F4BA6C-1BD6-4A50-A706-DCBC6A5D439B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_YAMN", "..\plugins\YAMN\proto_yamn\proto_YAMN_14.vcxproj", "{C1CDB82C-6BBF-496E-88F4-CC57E60B0CA9}" EndProject diff --git a/plugins/Weather/proto_weather/proto_weather.vcxproj b/plugins/Weather/proto_weather/proto_weather.vcxproj new file mode 100644 index 0000000000..355d059732 --- /dev/null +++ b/plugins/Weather/proto_weather/proto_weather.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Proto_Weather + {B2F4BA6C-1BD6-4A50-A706-DCBC6A5D439B} + + + + + \ No newline at end of file diff --git a/plugins/Weather/proto_weather/proto_weather.vcxproj.filters b/plugins/Weather/proto_weather/proto_weather.vcxproj.filters new file mode 100644 index 0000000000..e39f86d5d6 --- /dev/null +++ b/plugins/Weather/proto_weather/proto_weather.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/Weather/proto_weather/proto_weather_10.vcxproj b/plugins/Weather/proto_weather/proto_weather_10.vcxproj deleted file mode 100644 index 8187912e95..0000000000 --- a/plugins/Weather/proto_weather/proto_weather_10.vcxproj +++ /dev/null @@ -1,128 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - Proto_Weather - {B2F4BA6C-1BD6-4A50-A706-DCBC6A5D439B} - - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Windows - true - false - $(SolutionDir)\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - true - true - false - $(SolutionDir)\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - true - false - Windows - $(SolutionDir)\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - true - true - false - $(SolutionDir)\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - - - - - \ No newline at end of file diff --git a/plugins/Weather/proto_weather/proto_weather_10.vcxproj.filters b/plugins/Weather/proto_weather/proto_weather_10.vcxproj.filters deleted file mode 100644 index 27e90fab59..0000000000 --- a/plugins/Weather/proto_weather/proto_weather_10.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/Weather/proto_weather/proto_weather_12.vcxproj b/plugins/Weather/proto_weather/proto_weather_12.vcxproj deleted file mode 100644 index 85a15f723c..0000000000 --- a/plugins/Weather/proto_weather/proto_weather_12.vcxproj +++ /dev/null @@ -1,132 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - Proto_Weather - {B2F4BA6C-1BD6-4A50-A706-DCBC6A5D439B} - - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Windows - true - false - $(SolutionDir)\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - true - true - false - $(SolutionDir)\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - true - false - Windows - $(SolutionDir)\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - true - true - false - $(SolutionDir)\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - - - - - \ No newline at end of file diff --git a/plugins/Weather/proto_weather/proto_weather_12.vcxproj.filters b/plugins/Weather/proto_weather/proto_weather_12.vcxproj.filters deleted file mode 100644 index 27e90fab59..0000000000 --- a/plugins/Weather/proto_weather/proto_weather_12.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/Weather/proto_weather/proto_weather_14.vcxproj b/plugins/Weather/proto_weather/proto_weather_14.vcxproj deleted file mode 100644 index 6a5bab2081..0000000000 --- a/plugins/Weather/proto_weather/proto_weather_14.vcxproj +++ /dev/null @@ -1,132 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - Proto_Weather - {B2F4BA6C-1BD6-4A50-A706-DCBC6A5D439B} - - - - DynamicLibrary - Unicode - v140_xp - - - DynamicLibrary - Unicode - v140_xp - - - DynamicLibrary - Unicode - v140_xp - - - DynamicLibrary - Unicode - v140_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Windows - true - false - $(SolutionDir)\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - true - true - false - $(SolutionDir)\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - true - false - Windows - $(SolutionDir)\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - true - true - false - $(SolutionDir)\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - - - - - \ No newline at end of file diff --git a/plugins/Weather/proto_weather/proto_weather_14.vcxproj.filters b/plugins/Weather/proto_weather/proto_weather_14.vcxproj.filters deleted file mode 100644 index 27e90fab59..0000000000 --- a/plugins/Weather/proto_weather/proto_weather_14.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/Weather/src/stdafx.cpp b/plugins/Weather/src/stdafx.cpp deleted file mode 100644 index 2d786344e5..0000000000 --- a/plugins/Weather/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (c) 2012 Miranda NG team (http://miranda-ng.org) - -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 . -*/ - -#include "weather.h" \ No newline at end of file diff --git a/plugins/Weather/src/stdafx.cxx b/plugins/Weather/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/Weather/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) + +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 . +*/ + +#include "stdafx.h" \ No newline at end of file diff --git a/plugins/Weather/src/stdafx.h b/plugins/Weather/src/stdafx.h new file mode 100644 index 0000000000..dd86dfc4fc --- /dev/null +++ b/plugins/Weather/src/stdafx.h @@ -0,0 +1,550 @@ +/* +Weather Protocol plugin for Miranda NG +Copyright (c) 2012-2014 Miranda NG Team +Copyright (c) 2005-2011 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 . +*/ + +/* This file contains the includes, weather constants/declarations, + the structs, and the primitives for some of the functions. +*/ + +//============ THE INCLUDES =========== + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "resource.h" +#include "version.h" + +//============ CONSTANTS ============ + +// status +#define NOSTATUSDATA 1 + +// limits +#define MAX_TEXT_SIZE 4096 +#define MAX_DATA_LEN 1024 + +// db info mangement mode +#define WDBM_REMOVE 1 +#define WDBM_DETAILDISPLAY 2 + +// more info list column width +#define LIST_COLUMN 150 + +// others +#define NODATA TranslateT("N/A") +#define UM_SETCONTACT 40000 + +// weather update error codes +#define INVALID_ID_FORMAT 10 +#define INVALID_SVC 11 +#define INVALID_ID 12 +#define SVC_NOT_FOUND 20 +#define NETLIB_ERROR 30 +#define DATA_EMPTY 40 +#define DOC_NOT_FOUND 42 +#define DOC_TOO_SHORT 43 +#define UNKNOWN_ERROR 99 + +// weather update error text +#define E10 TranslateT("Invalid ID format, missing \"/\" (10)") +#define E11 TranslateT("Invalid service (11)") +#define E12 TranslateT("Invalid station (12)") +#define E20 TranslateT("Weather service ini for this station is not found (20)") +#define E30 TranslateT("Netlib error - check your internet connection (30)") +#define E40 TranslateT("Empty data is retrieved (40)") +#define E42 TranslateT("Document not found (42)") +#define E43 TranslateT("Document too short to contain any weather data (43)") +#define E99 TranslateT("Unknown error (99)") + +// HTTP error... not all translated +// 100 Continue +// 101 Switching Protocols +// 200 OK +// 201 Created +// 202 Accepted +// 203 Non-Authoritative Information +#define E204 TranslateT("HTTP Error: No content (204)") +// 205 Reset Content +// 206 Partial Content +// 300 Multiple Choices +#define E301 TranslateT("HTTP Error: Data moved (301)") +// 302 Found +// 303 See Other +// 304 Not Modified +#define E305 TranslateT("HTTP Error: Use proxy (305)") +// 306 (Unused) +#define E307 TranslateT("HTTP Error: Temporary redirect (307)") +#define E400 TranslateT("HTTP Error: Bad request (400)") +#define E401 TranslateT("HTTP Error: Unauthorized (401)") +#define E402 TranslateT("HTTP Error: Payment required (402)") +#define E403 TranslateT("HTTP Error: Forbidden (403)") +#define E404 TranslateT("HTTP Error: Not found (404)") +#define E405 TranslateT("HTTP Error: Method not allowed (405)") +// 406 Not Acceptable +#define E407 TranslateT("HTTP Error: Proxy authentication required (407)") +// 408 Request Timeout +// 409 Conflict +#define E410 TranslateT("HTTP Error: Gone (410)") +// 411 Length Required +// 412 Precondition Failed +// 413 Request Entity Too Large +// 414 Request-URI Too Long +// 415 Unsupported Media Type +// 416 Requested Range Not Satisfiable +// 417 Expectation Failed +#define E500 TranslateT("HTTP Error: Internal server error (500)") +// 501 Not Implemented +#define E502 TranslateT("HTTP Error: Bad gateway (502)") +#define E503 TranslateT("HTTP Error: Service unavailable (503)") +#define E504 TranslateT("HTTP Error: Gateway timeout (504)") +// 505 HTTP Version Not Supported + +// defaults constants +#define C_DEFAULT _T("%n [%t, %c]") +#define N_DEFAULT TranslateT("%c\\nTemperature: %t\\nFeel-Like: %f\\nPressure: %p\\nWind: %i %w\\nHumidity: %m\\nDew Point: %e\\nVisibility: %v\\n\\nSun Rise: %r\\nSun Set: %y\\n\\n5 Days Forecast:\\n%[Forecast Day 1]\\n%[Forecast Day 2]\\n%[Forecast Day 3]\\n%[Forecast Day 4]\\n%[Forecast Day 5]") +#define B_DEFAULT TranslateT("Feel-Like: %f\\nPressure: %p\\nWind: %i %w\\nHumidity: %m\\nDew Point: %e\\nVisibility: %v\\n\\nSun Rise: %r\\nSun Set: %y\\n\\n5 Days Forecast:\\n%[Forecast Day 1]\\n%[Forecast Day 2]\\n%[Forecast Day 3]\\n%[Forecast Day 4]\\n%[Forecast Day 5]") +#define b_DEFAULT TranslateT("Weather Condition for %n as of %u") +#define X_DEFAULT N_DEFAULT +#define H_DEFAULT TranslateT("%c, %t (feel-like %f) Wind: %i %w Humidity: %m") +#define E_DEFAULT TranslateT("%n at %u: %c, %t (feel-like %f) Wind: %i %w Humidity: %m") +#define P_DEFAULT TranslateT("%n (%u)") +#define p_DEFAULT TranslateT("%c, %t\\nToday: High %h, Low %l") +#define s_DEFAULT TranslateT("Temperature: %[Temperature]") +#define VAR_LIST_POPUP TranslateT("%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temperature\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set") +#define VAR_LIST_OPT TranslateT("%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temp\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set\n----------\n\\n\tnew line") +#define WEATHER_NO_INFO TranslateT("No information available.\r\nPlease update weather condition first.") +#define CUSTOM_VARS TranslateT("%[..]\tcustom variables") +#define VARS_LIST TranslateT("Here is a list of custom variables that are currently available") +#define NO_FORECAST_URL TranslateT("The URL for complete forecast has not been set. You can set it from the Edit Settings dialog.") +#define NO_MAP_URL TranslateT("The URL for weather map has not been set. You can set it from the Edit Settings dialog.") + +//============ OPTION STRUCT ============ + +// option struct +struct MYOPTIONS +{ + // main options + BYTE AutoUpdate; + BYTE CAutoUpdate; + BYTE StartupUpdate; + BYTE NoProtoCondition; + BYTE UpdateOnlyConditionChanged; + BYTE RemoveOldData; + BYTE MakeItalic; + + WORD UpdateTime; + WORD AvatarSize; + + // units + WORD tUnit; + WORD wUnit; + WORD vUnit; + WORD pUnit; + WORD dUnit; + WORD eUnit; + TCHAR DegreeSign[4]; + BYTE DoNotAppendUnit; + BYTE NoFrac; + + // texts + TCHAR *cText; + TCHAR *bTitle; + TCHAR *bText; + TCHAR *nText; + TCHAR *eText; + TCHAR *hText; + TCHAR *xText; + TCHAR *sText; + + // advanced + BYTE DisCondIcon; + + // popup options + BYTE UsePopup; + BYTE UpdatePopup; + BYTE AlertPopup; + BYTE PopupOnChange; + BYTE ShowWarnings; + + // popup colors + BYTE UseWinColors; + COLORREF BGColour; + COLORREF TextColour; + + // popup actions + DWORD LeftClickAction; + DWORD RightClickAction; + + // popup delay + DWORD pDelay; + + // popup texts + TCHAR *pTitle; + TCHAR *pText; + + // other misc stuff + TCHAR Default[64]; + MCONTACT DefStn; +}; + +void DestroyOptions(void); + +//============ STRUCT USED TO MAKE AN UPDATE LIST ============ + +struct WCONTACTLIST { + MCONTACT hContact; + struct WCONTACTLIST *next; +}; + +typedef struct WCONTACTLIST UPDATELIST; + +extern UPDATELIST *UpdateListHead; +extern UPDATELIST *UpdateListTail; + +void DestroyUpdateList(void); + +//============ DATA FORMAT STRUCT ============ + +#define WID_NORMAL 0 +#define WID_SET 1 +#define WID_BREAK 2 + +typedef struct { + TCHAR *Name; + TCHAR *Start; + TCHAR *End; + TCHAR *Unit; + char *Url; + TCHAR *Break; + int Type; +} WIDATAITEM; + +struct WITEMLIST { + WIDATAITEM Item; + struct WITEMLIST *Next; +}; + +typedef struct WITEMLIST WIDATAITEMLIST; + +typedef struct { + BOOL Available; + char *SearchURL; + TCHAR *NotFoundStr; + WIDATAITEM Name; +} WIIDSEARCH; + +typedef struct { + BOOL Available; + TCHAR *First; + WIDATAITEM Name; + WIDATAITEM ID; +} WINAMESEARCHTYPE; + +typedef struct { + char *SearchURL; + TCHAR *NotFoundStr; + TCHAR *SingleStr; + WINAMESEARCHTYPE Single; + WINAMESEARCHTYPE Multiple; +} WINAMESEARCH; + +struct STRLIST { + TCHAR *Item; + struct STRLIST *Next; +}; + +typedef struct STRLIST WICONDITEM; + +typedef struct { + WICONDITEM *Head; + WICONDITEM *Tail; +} WICONDLIST; + +typedef struct { + TCHAR *FileName; + TCHAR *ShortFileName; + BOOL Enabled; + + // header + TCHAR *DisplayName; + TCHAR *InternalName; + TCHAR *Description; + TCHAR *Author; + TCHAR *Version; + int InternalVer; + size_t MemUsed; + + // default + char *DefaultURL; + TCHAR *DefaultMap; + char *UpdateURL; + char *UpdateURL2; + char *UpdateURL3; + char *UpdateURL4; + char *Cookie; + char *UserAgent; +// items + int UpdateDataCount; + WIDATAITEMLIST *UpdateData; + WIDATAITEMLIST *UpdateDataTail; + WIIDSEARCH IDSearch; + WINAMESEARCH NameSearch; + WICONDLIST CondList[10]; +} WIDATA; + +//============ DATA LIST (LINKED LIST) ============ + +struct DATALIST { + WIDATA Data; + struct DATALIST *next; +}; + +typedef struct DATALIST WIDATALIST; + +//============ GLOBAL VARIABLES ============ + +extern WIDATALIST *WIHead; +extern WIDATALIST *WITail; + +extern HINSTANCE hInst; +extern HWND hPopupWindow; +extern HWND hWndSetup; + +extern MYOPTIONS opt; + +extern unsigned status; +extern unsigned old_status; + +extern MWindowList hDataWindowList; +extern MWindowList hWindowList; + +extern HANDLE hNetlibUser, hNetlibHttp; +extern HANDLE hHookWeatherUpdated; +extern HANDLE hHookWeatherError; +extern HANDLE hTBButton; +extern UINT_PTR timerId; +extern HANDLE hUpdateMutex; + +extern HGENMENU hMwinMenu; + +// check if weather is currently updating +extern BOOL ThreadRunning; + +//============ FUNCTION PRIMITIVES ============ + +// functions in weather_addstn.c +INT_PTR WeatherAddToList(WPARAM wParam,LPARAM lParam); +BOOL CheckSearch(); + +int IDSearch(TCHAR *id, const int searchId); +int NameSearch(TCHAR *name, const int searchId); + +INT_PTR WeatherBasicSearch(WPARAM wParam,LPARAM lParam); +INT_PTR WeatherCreateAdvancedSearchUI(WPARAM wParam, LPARAM lParam); +INT_PTR WeatherAdvancedSearch(WPARAM wParam, LPARAM lParam); + +int WeatherAdd(WPARAM wParam, LPARAM lParam); + +// functions used in weather_contacts.c +INT_PTR ViewLog(WPARAM wParam,LPARAM lParam); +INT_PTR LoadForecast(WPARAM wParam,LPARAM lParam); +INT_PTR WeatherMap(WPARAM wParam,LPARAM lParam); + +INT_PTR EditSettings(WPARAM wParam,LPARAM lParam); +INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); + +int ContactDeleted(WPARAM wParam,LPARAM lParam); + +BOOL IsMyContact(MCONTACT hContact); + +// functions in weather_conv.c +BOOL is_number(char *s); + +void GetTemp(TCHAR *tempchar, TCHAR *unit, TCHAR *str); +void GetSpeed(TCHAR *tempchar, TCHAR *unit, TCHAR *str); +void GetPressure(TCHAR *tempchar, TCHAR *unit, TCHAR *str); +void GetDist(TCHAR *tempchar, TCHAR *unit, TCHAR *str); +void GetElev(TCHAR *tempchar, TCHAR *unit, TCHAR *str); + +WORD GetIcon(const TCHAR* cond, WIDATA *Data); +void CaseConv(TCHAR *str); +void TrimString(char *str); +void TrimString(WCHAR *str); +void ConvertBackslashes(char *str); +char *GetSearchStr(char *dis); + +TCHAR *GetDisplay(WEATHERINFO *w, const TCHAR *dis, TCHAR* str); +INT_PTR GetDisplaySvcFunc(WPARAM wParam, LPARAM lParam); + +void GetSvc(TCHAR *pszID); +void GetID(TCHAR *pszID); + +TCHAR *GetError(int code); + +// functions in weather_data.c +void GetStationID(MCONTACT hContact, TCHAR* id, size_t idlen); +WEATHERINFO LoadWeatherInfo(MCONTACT Change); +int DBGetData(MCONTACT hContact, char *setting, DBVARIANT *dbv); +int DBGetStaticString(MCONTACT hContact, const char *szModule, const char *valueName, TCHAR *dest, size_t dest_len); + +void EraseAllInfo(void); + +void LoadStationData(TCHAR *pszFile, TCHAR *pszShortFile, WIDATA *Data); +void GetDataValue(WIDATAITEM *UpdateData, TCHAR *Data, TCHAR** szInfo); +void ConvertDataValue(WIDATAITEM *UpdateData, TCHAR *Data); +void wSetData(char **Data, const char *Value); +void wSetData(WCHAR **Data, const char *Value); +void wSetData(WCHAR **Data, const WCHAR *Value); +void wfree(char **Data); +void wfree(WCHAR **Data); + +void DBDataManage(MCONTACT hContact, WORD Mode, WPARAM wParam, LPARAM lParam); + +// functions in weather_http.c +int InternetDownloadFile (char *szUrl, char *cookie, char *userAgent, TCHAR** szData); +void NetlibInit(); +void NetlibHttpDisconnect(void); + +// functions in weather_ini.c +void WIListAdd(WIDATA Data); +WIDATA* GetWIData(TCHAR *pszServ); + +bool IsContainedInCondList(const TCHAR *pszStr, WICONDLIST *List); + +void DestroyWIList(); +bool LoadWIData(bool dial); +void FreeWIData(WIDATA *Data); + +INT_PTR CALLBACK DlgProcSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); + +// functions in weather_info.c +void GetINIInfo(TCHAR *pszSvc); + +void MoreVarList(); + +// functions in weather_opt.c +void SetTextDefault(const char* in); +void LoadOptions(); +void SaveOptions(); + +int OptInit(WPARAM wParam,LPARAM lParam); + +INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam); +void SetIconDefault(); +void RemoveIconSettings(); + +BOOL CALLBACK TextOptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam); +BOOL CALLBACK AdvOptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam); +INT_PTR CALLBACK DlgProcText(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK DlgPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); + +// functions in weather_popup.c +int WeatherPopup(WPARAM wParam, LPARAM lParam); +int WeatherError(WPARAM wParam, LPARAM lParam); +int WPShowMessage(TCHAR* lpzText, WORD kind); + +LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); +LRESULT CALLBACK PopupWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + +// functions in weather_svcs.c +void InitServices(void); + +INT_PTR WeatherSetStatus(WPARAM new_status, LPARAM lParam); +INT_PTR WeatherGetCaps(WPARAM wParam, LPARAM lParam); +INT_PTR WeatherGetName(WPARAM wParam, LPARAM lParam); +INT_PTR WeatherGetStatus(WPARAM wParam, LPARAM lParam); +INT_PTR WeatherLoadIcon(WPARAM wParam, LPARAM lParam); + +void UpdateMenu(BOOL State); +void UpdatePopupMenu(BOOL State); +void AddMenuItems(); +void AvatarDownloaded(MCONTACT hContact); + +// functions in weather_update.c +int UpdateWeather(MCONTACT hContact); + +int RetrieveWeather(MCONTACT hContact, WEATHERINFO *winfo); + +void UpdateAll(BOOL AutoUpdate, BOOL RemoveOld); +void UpdateThreadProc(LPVOID hWnd); +INT_PTR UpdateSingleStation(WPARAM wParam,LPARAM lParam); +INT_PTR UpdateAllInfo(WPARAM wParam,LPARAM lParam); +INT_PTR UpdateSingleRemove(WPARAM wParam,LPARAM lParam); +INT_PTR UpdateAllRemove(WPARAM wParam,LPARAM lParam); + +int GetWeatherData(MCONTACT hContact); + +void CALLBACK timerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime); +void CALLBACK timerProc2(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime); + +// function from multiwin module +void InitMwin(void); +void DestroyMwin(void); +INT_PTR Mwin_MenuClicked(WPARAM wParam, LPARAM lParam); +int BuildContactMenu(WPARAM wparam, LPARAM lparam); +void UpdateMwinData(MCONTACT hContact); +void removeWindow(MCONTACT hContact); + +// functions in weather_userinfo.c +int UserInfoInit(WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK DlgProcUIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK DlgProcMoreData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK DlgProcINIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); + +#define WM_UPDATEDATA WM_USER + 2687 + +int BriefInfo(WPARAM wParam, LPARAM lParam); +INT_PTR BriefInfoSvc(WPARAM wParam, LPARAM lParam); +void LoadBriefInfoText(HWND hwndDlg, MCONTACT hContact); +INT_PTR CALLBACK DlgProcBrief(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); + +void InitIcons(void); +HICON LoadIconEx(const char* name, bool big); +HANDLE GetIconHandle(const char* name); +void ReleaseIconEx(HICON hIcon); diff --git a/plugins/Weather/src/weather.cpp b/plugins/Weather/src/weather.cpp index 458e7f1586..a4481b2605 100644 --- a/plugins/Weather/src/weather.cpp +++ b/plugins/Weather/src/weather.cpp @@ -24,7 +24,7 @@ upgrading, support for plugin uninsaller, and anything that doesn't belong to any other file. */ -#include "weather.h" +#include "stdafx.h" //============ GLOBAL VARIABLES ============ diff --git a/plugins/Weather/src/weather.h b/plugins/Weather/src/weather.h deleted file mode 100644 index 6dfcb98e11..0000000000 --- a/plugins/Weather/src/weather.h +++ /dev/null @@ -1,552 +0,0 @@ -/* -Weather Protocol plugin for Miranda NG -Copyright (c) 2012-2014 Miranda NG Team -Copyright (c) 2005-2011 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 . -*/ - -/* This file contains the includes, weather constants/declarations, - the structs, and the primitives for some of the functions. -*/ - -//============ THE INCLUDES =========== - -#define _CRT_SECURE_NO_WARNINGS - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "resource.h" -#include "version.h" - -//============ CONSTANTS ============ - -// status -#define NOSTATUSDATA 1 - -// limits -#define MAX_TEXT_SIZE 4096 -#define MAX_DATA_LEN 1024 - -// db info mangement mode -#define WDBM_REMOVE 1 -#define WDBM_DETAILDISPLAY 2 - -// more info list column width -#define LIST_COLUMN 150 - -// others -#define NODATA TranslateT("N/A") -#define UM_SETCONTACT 40000 - -// weather update error codes -#define INVALID_ID_FORMAT 10 -#define INVALID_SVC 11 -#define INVALID_ID 12 -#define SVC_NOT_FOUND 20 -#define NETLIB_ERROR 30 -#define DATA_EMPTY 40 -#define DOC_NOT_FOUND 42 -#define DOC_TOO_SHORT 43 -#define UNKNOWN_ERROR 99 - -// weather update error text -#define E10 TranslateT("Invalid ID format, missing \"/\" (10)") -#define E11 TranslateT("Invalid service (11)") -#define E12 TranslateT("Invalid station (12)") -#define E20 TranslateT("Weather service ini for this station is not found (20)") -#define E30 TranslateT("Netlib error - check your internet connection (30)") -#define E40 TranslateT("Empty data is retrieved (40)") -#define E42 TranslateT("Document not found (42)") -#define E43 TranslateT("Document too short to contain any weather data (43)") -#define E99 TranslateT("Unknown error (99)") - -// HTTP error... not all translated -// 100 Continue -// 101 Switching Protocols -// 200 OK -// 201 Created -// 202 Accepted -// 203 Non-Authoritative Information -#define E204 TranslateT("HTTP Error: No content (204)") -// 205 Reset Content -// 206 Partial Content -// 300 Multiple Choices -#define E301 TranslateT("HTTP Error: Data moved (301)") -// 302 Found -// 303 See Other -// 304 Not Modified -#define E305 TranslateT("HTTP Error: Use proxy (305)") -// 306 (Unused) -#define E307 TranslateT("HTTP Error: Temporary redirect (307)") -#define E400 TranslateT("HTTP Error: Bad request (400)") -#define E401 TranslateT("HTTP Error: Unauthorized (401)") -#define E402 TranslateT("HTTP Error: Payment required (402)") -#define E403 TranslateT("HTTP Error: Forbidden (403)") -#define E404 TranslateT("HTTP Error: Not found (404)") -#define E405 TranslateT("HTTP Error: Method not allowed (405)") -// 406 Not Acceptable -#define E407 TranslateT("HTTP Error: Proxy authentication required (407)") -// 408 Request Timeout -// 409 Conflict -#define E410 TranslateT("HTTP Error: Gone (410)") -// 411 Length Required -// 412 Precondition Failed -// 413 Request Entity Too Large -// 414 Request-URI Too Long -// 415 Unsupported Media Type -// 416 Requested Range Not Satisfiable -// 417 Expectation Failed -#define E500 TranslateT("HTTP Error: Internal server error (500)") -// 501 Not Implemented -#define E502 TranslateT("HTTP Error: Bad gateway (502)") -#define E503 TranslateT("HTTP Error: Service unavailable (503)") -#define E504 TranslateT("HTTP Error: Gateway timeout (504)") -// 505 HTTP Version Not Supported - -// defaults constants -#define C_DEFAULT _T("%n [%t, %c]") -#define N_DEFAULT TranslateT("%c\\nTemperature: %t\\nFeel-Like: %f\\nPressure: %p\\nWind: %i %w\\nHumidity: %m\\nDew Point: %e\\nVisibility: %v\\n\\nSun Rise: %r\\nSun Set: %y\\n\\n5 Days Forecast:\\n%[Forecast Day 1]\\n%[Forecast Day 2]\\n%[Forecast Day 3]\\n%[Forecast Day 4]\\n%[Forecast Day 5]") -#define B_DEFAULT TranslateT("Feel-Like: %f\\nPressure: %p\\nWind: %i %w\\nHumidity: %m\\nDew Point: %e\\nVisibility: %v\\n\\nSun Rise: %r\\nSun Set: %y\\n\\n5 Days Forecast:\\n%[Forecast Day 1]\\n%[Forecast Day 2]\\n%[Forecast Day 3]\\n%[Forecast Day 4]\\n%[Forecast Day 5]") -#define b_DEFAULT TranslateT("Weather Condition for %n as of %u") -#define X_DEFAULT N_DEFAULT -#define H_DEFAULT TranslateT("%c, %t (feel-like %f) Wind: %i %w Humidity: %m") -#define E_DEFAULT TranslateT("%n at %u: %c, %t (feel-like %f) Wind: %i %w Humidity: %m") -#define P_DEFAULT TranslateT("%n (%u)") -#define p_DEFAULT TranslateT("%c, %t\\nToday: High %h, Low %l") -#define s_DEFAULT TranslateT("Temperature: %[Temperature]") -#define VAR_LIST_POPUP TranslateT("%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temperature\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set") -#define VAR_LIST_OPT TranslateT("%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temp\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set\n----------\n\\n\tnew line") -#define WEATHER_NO_INFO TranslateT("No information available.\r\nPlease update weather condition first.") -#define CUSTOM_VARS TranslateT("%[..]\tcustom variables") -#define VARS_LIST TranslateT("Here is a list of custom variables that are currently available") -#define NO_FORECAST_URL TranslateT("The URL for complete forecast has not been set. You can set it from the Edit Settings dialog.") -#define NO_MAP_URL TranslateT("The URL for weather map has not been set. You can set it from the Edit Settings dialog.") - -//============ OPTION STRUCT ============ - -// option struct -struct MYOPTIONS -{ - // main options - BYTE AutoUpdate; - BYTE CAutoUpdate; - BYTE StartupUpdate; - BYTE NoProtoCondition; - BYTE UpdateOnlyConditionChanged; - BYTE RemoveOldData; - BYTE MakeItalic; - - WORD UpdateTime; - WORD AvatarSize; - - // units - WORD tUnit; - WORD wUnit; - WORD vUnit; - WORD pUnit; - WORD dUnit; - WORD eUnit; - TCHAR DegreeSign[4]; - BYTE DoNotAppendUnit; - BYTE NoFrac; - - // texts - TCHAR *cText; - TCHAR *bTitle; - TCHAR *bText; - TCHAR *nText; - TCHAR *eText; - TCHAR *hText; - TCHAR *xText; - TCHAR *sText; - - // advanced - BYTE DisCondIcon; - - // popup options - BYTE UsePopup; - BYTE UpdatePopup; - BYTE AlertPopup; - BYTE PopupOnChange; - BYTE ShowWarnings; - - // popup colors - BYTE UseWinColors; - COLORREF BGColour; - COLORREF TextColour; - - // popup actions - DWORD LeftClickAction; - DWORD RightClickAction; - - // popup delay - DWORD pDelay; - - // popup texts - TCHAR *pTitle; - TCHAR *pText; - - // other misc stuff - TCHAR Default[64]; - MCONTACT DefStn; -}; - -void DestroyOptions(void); - -//============ STRUCT USED TO MAKE AN UPDATE LIST ============ - -struct WCONTACTLIST { - MCONTACT hContact; - struct WCONTACTLIST *next; -}; - -typedef struct WCONTACTLIST UPDATELIST; - -extern UPDATELIST *UpdateListHead; -extern UPDATELIST *UpdateListTail; - -void DestroyUpdateList(void); - -//============ DATA FORMAT STRUCT ============ - -#define WID_NORMAL 0 -#define WID_SET 1 -#define WID_BREAK 2 - -typedef struct { - TCHAR *Name; - TCHAR *Start; - TCHAR *End; - TCHAR *Unit; - char *Url; - TCHAR *Break; - int Type; -} WIDATAITEM; - -struct WITEMLIST { - WIDATAITEM Item; - struct WITEMLIST *Next; -}; - -typedef struct WITEMLIST WIDATAITEMLIST; - -typedef struct { - BOOL Available; - char *SearchURL; - TCHAR *NotFoundStr; - WIDATAITEM Name; -} WIIDSEARCH; - -typedef struct { - BOOL Available; - TCHAR *First; - WIDATAITEM Name; - WIDATAITEM ID; -} WINAMESEARCHTYPE; - -typedef struct { - char *SearchURL; - TCHAR *NotFoundStr; - TCHAR *SingleStr; - WINAMESEARCHTYPE Single; - WINAMESEARCHTYPE Multiple; -} WINAMESEARCH; - -struct STRLIST { - TCHAR *Item; - struct STRLIST *Next; -}; - -typedef struct STRLIST WICONDITEM; - -typedef struct { - WICONDITEM *Head; - WICONDITEM *Tail; -} WICONDLIST; - -typedef struct { - TCHAR *FileName; - TCHAR *ShortFileName; - BOOL Enabled; - - // header - TCHAR *DisplayName; - TCHAR *InternalName; - TCHAR *Description; - TCHAR *Author; - TCHAR *Version; - int InternalVer; - size_t MemUsed; - - // default - char *DefaultURL; - TCHAR *DefaultMap; - char *UpdateURL; - char *UpdateURL2; - char *UpdateURL3; - char *UpdateURL4; - char *Cookie; - char *UserAgent; -// items - int UpdateDataCount; - WIDATAITEMLIST *UpdateData; - WIDATAITEMLIST *UpdateDataTail; - WIIDSEARCH IDSearch; - WINAMESEARCH NameSearch; - WICONDLIST CondList[10]; -} WIDATA; - -//============ DATA LIST (LINKED LIST) ============ - -struct DATALIST { - WIDATA Data; - struct DATALIST *next; -}; - -typedef struct DATALIST WIDATALIST; - -//============ GLOBAL VARIABLES ============ - -extern WIDATALIST *WIHead; -extern WIDATALIST *WITail; - -extern HINSTANCE hInst; -extern HWND hPopupWindow; -extern HWND hWndSetup; - -extern MYOPTIONS opt; - -extern unsigned status; -extern unsigned old_status; - -extern MWindowList hDataWindowList; -extern MWindowList hWindowList; - -extern HANDLE hNetlibUser, hNetlibHttp; -extern HANDLE hHookWeatherUpdated; -extern HANDLE hHookWeatherError; -extern HANDLE hTBButton; -extern UINT_PTR timerId; -extern HANDLE hUpdateMutex; - -extern HGENMENU hMwinMenu; - -// check if weather is currently updating -extern BOOL ThreadRunning; - -//============ FUNCTION PRIMITIVES ============ - -// functions in weather_addstn.c -INT_PTR WeatherAddToList(WPARAM wParam,LPARAM lParam); -BOOL CheckSearch(); - -int IDSearch(TCHAR *id, const int searchId); -int NameSearch(TCHAR *name, const int searchId); - -INT_PTR WeatherBasicSearch(WPARAM wParam,LPARAM lParam); -INT_PTR WeatherCreateAdvancedSearchUI(WPARAM wParam, LPARAM lParam); -INT_PTR WeatherAdvancedSearch(WPARAM wParam, LPARAM lParam); - -int WeatherAdd(WPARAM wParam, LPARAM lParam); - -// functions used in weather_contacts.c -INT_PTR ViewLog(WPARAM wParam,LPARAM lParam); -INT_PTR LoadForecast(WPARAM wParam,LPARAM lParam); -INT_PTR WeatherMap(WPARAM wParam,LPARAM lParam); - -INT_PTR EditSettings(WPARAM wParam,LPARAM lParam); -INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); - -int ContactDeleted(WPARAM wParam,LPARAM lParam); - -BOOL IsMyContact(MCONTACT hContact); - -// functions in weather_conv.c -BOOL is_number(char *s); - -void GetTemp(TCHAR *tempchar, TCHAR *unit, TCHAR *str); -void GetSpeed(TCHAR *tempchar, TCHAR *unit, TCHAR *str); -void GetPressure(TCHAR *tempchar, TCHAR *unit, TCHAR *str); -void GetDist(TCHAR *tempchar, TCHAR *unit, TCHAR *str); -void GetElev(TCHAR *tempchar, TCHAR *unit, TCHAR *str); - -WORD GetIcon(const TCHAR* cond, WIDATA *Data); -void CaseConv(TCHAR *str); -void TrimString(char *str); -void TrimString(WCHAR *str); -void ConvertBackslashes(char *str); -char *GetSearchStr(char *dis); - -TCHAR *GetDisplay(WEATHERINFO *w, const TCHAR *dis, TCHAR* str); -INT_PTR GetDisplaySvcFunc(WPARAM wParam, LPARAM lParam); - -void GetSvc(TCHAR *pszID); -void GetID(TCHAR *pszID); - -TCHAR *GetError(int code); - -// functions in weather_data.c -void GetStationID(MCONTACT hContact, TCHAR* id, size_t idlen); -WEATHERINFO LoadWeatherInfo(MCONTACT Change); -int DBGetData(MCONTACT hContact, char *setting, DBVARIANT *dbv); -int DBGetStaticString(MCONTACT hContact, const char *szModule, const char *valueName, TCHAR *dest, size_t dest_len); - -void EraseAllInfo(void); - -void LoadStationData(TCHAR *pszFile, TCHAR *pszShortFile, WIDATA *Data); -void GetDataValue(WIDATAITEM *UpdateData, TCHAR *Data, TCHAR** szInfo); -void ConvertDataValue(WIDATAITEM *UpdateData, TCHAR *Data); -void wSetData(char **Data, const char *Value); -void wSetData(WCHAR **Data, const char *Value); -void wSetData(WCHAR **Data, const WCHAR *Value); -void wfree(char **Data); -void wfree(WCHAR **Data); - -void DBDataManage(MCONTACT hContact, WORD Mode, WPARAM wParam, LPARAM lParam); - -// functions in weather_http.c -int InternetDownloadFile (char *szUrl, char *cookie, char *userAgent, TCHAR** szData); -void NetlibInit(); -void NetlibHttpDisconnect(void); - -// functions in weather_ini.c -void WIListAdd(WIDATA Data); -WIDATA* GetWIData(TCHAR *pszServ); - -bool IsContainedInCondList(const TCHAR *pszStr, WICONDLIST *List); - -void DestroyWIList(); -bool LoadWIData(bool dial); -void FreeWIData(WIDATA *Data); - -INT_PTR CALLBACK DlgProcSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); - -// functions in weather_info.c -void GetINIInfo(TCHAR *pszSvc); - -void MoreVarList(); - -// functions in weather_opt.c -void SetTextDefault(const char* in); -void LoadOptions(); -void SaveOptions(); - -int OptInit(WPARAM wParam,LPARAM lParam); - -INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam); -void SetIconDefault(); -void RemoveIconSettings(); - -BOOL CALLBACK TextOptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam); -BOOL CALLBACK AdvOptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam); -INT_PTR CALLBACK DlgProcText(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK DlgPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); - -// functions in weather_popup.c -int WeatherPopup(WPARAM wParam, LPARAM lParam); -int WeatherError(WPARAM wParam, LPARAM lParam); -int WPShowMessage(TCHAR* lpzText, WORD kind); - -LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); -LRESULT CALLBACK PopupWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - -// functions in weather_svcs.c -void InitServices(void); - -INT_PTR WeatherSetStatus(WPARAM new_status, LPARAM lParam); -INT_PTR WeatherGetCaps(WPARAM wParam, LPARAM lParam); -INT_PTR WeatherGetName(WPARAM wParam, LPARAM lParam); -INT_PTR WeatherGetStatus(WPARAM wParam, LPARAM lParam); -INT_PTR WeatherLoadIcon(WPARAM wParam, LPARAM lParam); - -void UpdateMenu(BOOL State); -void UpdatePopupMenu(BOOL State); -void AddMenuItems(); -void AvatarDownloaded(MCONTACT hContact); - -// functions in weather_update.c -int UpdateWeather(MCONTACT hContact); - -int RetrieveWeather(MCONTACT hContact, WEATHERINFO *winfo); - -void UpdateAll(BOOL AutoUpdate, BOOL RemoveOld); -void UpdateThreadProc(LPVOID hWnd); -INT_PTR UpdateSingleStation(WPARAM wParam,LPARAM lParam); -INT_PTR UpdateAllInfo(WPARAM wParam,LPARAM lParam); -INT_PTR UpdateSingleRemove(WPARAM wParam,LPARAM lParam); -INT_PTR UpdateAllRemove(WPARAM wParam,LPARAM lParam); - -int GetWeatherData(MCONTACT hContact); - -void CALLBACK timerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime); -void CALLBACK timerProc2(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime); - -// function from multiwin module -void InitMwin(void); -void DestroyMwin(void); -INT_PTR Mwin_MenuClicked(WPARAM wParam, LPARAM lParam); -int BuildContactMenu(WPARAM wparam, LPARAM lparam); -void UpdateMwinData(MCONTACT hContact); -void removeWindow(MCONTACT hContact); - -// functions in weather_userinfo.c -int UserInfoInit(WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK DlgProcUIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK DlgProcMoreData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK DlgProcINIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); - -#define WM_UPDATEDATA WM_USER + 2687 - -int BriefInfo(WPARAM wParam, LPARAM lParam); -INT_PTR BriefInfoSvc(WPARAM wParam, LPARAM lParam); -void LoadBriefInfoText(HWND hwndDlg, MCONTACT hContact); -INT_PTR CALLBACK DlgProcBrief(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); - -void InitIcons(void); -HICON LoadIconEx(const char* name, bool big); -HANDLE GetIconHandle(const char* name); -void ReleaseIconEx(HICON hIcon); diff --git a/plugins/Weather/src/weather_addstn.cpp b/plugins/Weather/src/weather_addstn.cpp index 167675d2e5..85b4be596c 100644 --- a/plugins/Weather/src/weather_addstn.cpp +++ b/plugins/Weather/src/weather_addstn.cpp @@ -22,7 +22,7 @@ along with this program. If not, see . to the contact list. Contain code for both name and ID search. */ -#include "weather.h" +#include "stdafx.h" // variables used for weather_addstn.c static int searchId = -1; diff --git a/plugins/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp index 0bffa5a857..84ced72294 100644 --- a/plugins/Weather/src/weather_contacts.cpp +++ b/plugins/Weather/src/weather_contacts.cpp @@ -23,7 +23,7 @@ include the links, edit settings, and loading weather information for the contact. */ -#include "weather.h" +#include "stdafx.h" static void OpenUrl(TCHAR* format, TCHAR* id) { diff --git a/plugins/Weather/src/weather_conv.cpp b/plugins/Weather/src/weather_conv.cpp index 22bd529140..5d546609aa 100644 --- a/plugins/Weather/src/weather_conv.cpp +++ b/plugins/Weather/src/weather_conv.cpp @@ -23,7 +23,7 @@ This file contain the source related unit conversion, icon assignment, string conversions, display text parsing, etc */ -#include "weather.h" +#include "stdafx.h" //============ SOME HELPER FUNCTIONS ============ diff --git a/plugins/Weather/src/weather_data.cpp b/plugins/Weather/src/weather_data.cpp index b800bd0f94..c49194e720 100644 --- a/plugins/Weather/src/weather_data.cpp +++ b/plugins/Weather/src/weather_data.cpp @@ -23,7 +23,7 @@ This file contain the source related loading, obtaining, and saving individual weather data for a weather contact. */ -#include "weather.h" +#include "stdafx.h" //============ LOAD WEATHER INFO FROM A CONTACT ============ // get station ID from DB diff --git a/plugins/Weather/src/weather_http.cpp b/plugins/Weather/src/weather_http.cpp index f6258efb74..7d6f0e1ff0 100644 --- a/plugins/Weather/src/weather_http.cpp +++ b/plugins/Weather/src/weather_http.cpp @@ -23,7 +23,7 @@ This file contain the source related to downloading weather info from the web using netlib */ -#include "weather.h" +#include "stdafx.h" HANDLE hNetlibUser, hNetlibHttp; diff --git a/plugins/Weather/src/weather_icons.cpp b/plugins/Weather/src/weather_icons.cpp index 207bc0d338..16d8468cd9 100644 --- a/plugins/Weather/src/weather_icons.cpp +++ b/plugins/Weather/src/weather_icons.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . */ -#include "weather.h" +#include "stdafx.h" HANDLE hIcoLibIconsChanged = NULL; diff --git a/plugins/Weather/src/weather_info.cpp b/plugins/Weather/src/weather_info.cpp index 8065433f35..7b24cbc804 100644 --- a/plugins/Weather/src/weather_info.cpp +++ b/plugins/Weather/src/weather_info.cpp @@ -25,7 +25,7 @@ ini files, as well as function that are used for debug purpose regrading the loading of ini contents */ -#include "weather.h" +#include "stdafx.h" //============ INI INFORMATION ============ diff --git a/plugins/Weather/src/weather_ini.cpp b/plugins/Weather/src/weather_ini.cpp index f39cb973ac..3a55f8554d 100644 --- a/plugins/Weather/src/weather_ini.cpp +++ b/plugins/Weather/src/weather_ini.cpp @@ -25,7 +25,7 @@ weather ini files and store them into memory. Also containing code for unloading and getting weather data from the ini settings. */ -#include "weather.h" +#include "stdafx.h" HWND hWndSetup; diff --git a/plugins/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp index fd251c49cb..7d24297c9f 100644 --- a/plugins/Weather/src/weather_mwin.cpp +++ b/plugins/Weather/src/weather_mwin.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "weather.h" +#include "stdafx.h" #define MS_TOOLTIP_SHOWTIP "mToolTip/ShowTip" #define MS_TOOLTIP_HIDETIP "mToolTip/HideTip" diff --git a/plugins/Weather/src/weather_opt.cpp b/plugins/Weather/src/weather_opt.cpp index 691defdd08..d6181671ec 100644 --- a/plugins/Weather/src/weather_opt.cpp +++ b/plugins/Weather/src/weather_opt.cpp @@ -22,7 +22,7 @@ along with this program. If not, see . contain code for saving/loading options from the database. */ -#include "weather.h" +#include "stdafx.h" static BOOL opt_startup; int RedrawFrame(WPARAM wParam, LPARAM lParam); diff --git a/plugins/Weather/src/weather_popup.cpp b/plugins/Weather/src/weather_popup.cpp index 09c4e4fe6b..31934095cc 100644 --- a/plugins/Weather/src/weather_popup.cpp +++ b/plugins/Weather/src/weather_popup.cpp @@ -22,7 +22,7 @@ along with this program. If not, see . options, popup display, and the code for popup process. */ -#include "weather.h" +#include "stdafx.h" // variables for weather_popup.c static HANDLE hPopupContact; diff --git a/plugins/Weather/src/weather_svcs.cpp b/plugins/Weather/src/weather_svcs.cpp index fdc93fdc06..972670128e 100644 --- a/plugins/Weather/src/weather_svcs.cpp +++ b/plugins/Weather/src/weather_svcs.cpp @@ -24,7 +24,7 @@ as required for a Miranda protocol. Also, it contains functions for building/changing the weather menu items. */ -#include "weather.h" +#include "stdafx.h" static HGENMENU hEnableDisablePopupMenu; static HGENMENU hEnableDisableMenu; diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp index 5e45b69732..97fbfe48d0 100644 --- a/plugins/Weather/src/weather_update.cpp +++ b/plugins/Weather/src/weather_update.cpp @@ -24,7 +24,7 @@ information, both automatic (by timer) and manually (by selecting menu items). */ -#include "weather.h" +#include "stdafx.h" UPDATELIST *UpdateListHead; UPDATELIST *UpdateListTail; diff --git a/plugins/Weather/src/weather_userinfo.cpp b/plugins/Weather/src/weather_userinfo.cpp index 0eb97fdb30..8e0fc7116f 100644 --- a/plugins/Weather/src/weather_userinfo.cpp +++ b/plugins/Weather/src/weather_userinfo.cpp @@ -25,7 +25,7 @@ information, including the one shows in user detail and the brief information */ -#include "weather.h" +#include "stdafx.h" //============ CONTACT INFORMATION ============ diff --git a/plugins/Weather/weather.vcxproj b/plugins/Weather/weather.vcxproj new file mode 100644 index 0000000000..54e38cc28e --- /dev/null +++ b/plugins/Weather/weather.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Weather + {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE} + + + + + \ No newline at end of file diff --git a/plugins/Weather/weather.vcxproj.filters b/plugins/Weather/weather.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/Weather/weather.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/Weather/weather_10.vcxproj b/plugins/Weather/weather_10.vcxproj deleted file mode 100644 index 3ad08f96de..0000000000 --- a/plugins/Weather/weather_10.vcxproj +++ /dev/null @@ -1,221 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - Weather - {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE} - - - - DynamicLibrary - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - Unicode - - - DynamicLibrary - true - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - true - - - - Full - OnlyExplicitInline - Size - true - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - false - true - Fast - Level3 - weather.h - Use - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - 0x72030000 - false - $(IntDir)$(TargetName).lib - true - Windows - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - false - true - Fast - weather.h - Level3 - Use - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - 0x72030000 - false - $(IntDir)$(TargetName).lib - true - Windows - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - Disabled - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - weather.h - Level3 - EditAndContinue - Use - true - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - 0x72030000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin10\lib - - - - - Disabled - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - weather.h - Level3 - Use - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - 0x72030000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin10\lib - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/Weather/weather_10.vcxproj.filters b/plugins/Weather/weather_10.vcxproj.filters deleted file mode 100644 index eb4d71d1eb..0000000000 --- a/plugins/Weather/weather_10.vcxproj.filters +++ /dev/null @@ -1,86 +0,0 @@ - - - - - {ae98b833-66fd-4d03-8883-da86b699da8e} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {229b056a-ba07-4698-ad86-26548bd87e32} - h;hpp;hxx;hm;inl - - - {4be16e1a-70ca-4330-b259-db32ec58dcc0} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/Weather/weather_12.vcxproj b/plugins/Weather/weather_12.vcxproj deleted file mode 100644 index 4c8467ffb9..0000000000 --- a/plugins/Weather/weather_12.vcxproj +++ /dev/null @@ -1,224 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - Weather - {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE} - - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - true - Unicode - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - true - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - true - - - - Full - OnlyExplicitInline - Size - true - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - false - true - Fast - Level3 - weather.h - Use - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - 0x72030000 - false - $(IntDir)$(TargetName).lib - true - Windows - $(ProfileDir)..\..\bin12\lib - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - false - true - Fast - weather.h - Level3 - Use - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - 0x72030000 - false - $(IntDir)$(TargetName).lib - true - Windows - $(ProfileDir)..\..\bin12\lib - - - - - Disabled - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - weather.h - Level3 - EditAndContinue - Use - true - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - 0x72030000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin12\lib - false - - - - - Disabled - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - weather.h - Level3 - Use - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - 0x72030000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin12\lib - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/Weather/weather_12.vcxproj.filters b/plugins/Weather/weather_12.vcxproj.filters deleted file mode 100644 index eb4d71d1eb..0000000000 --- a/plugins/Weather/weather_12.vcxproj.filters +++ /dev/null @@ -1,86 +0,0 @@ - - - - - {ae98b833-66fd-4d03-8883-da86b699da8e} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {229b056a-ba07-4698-ad86-26548bd87e32} - h;hpp;hxx;hm;inl - - - {4be16e1a-70ca-4330-b259-db32ec58dcc0} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/Weather/weather_14.vcxproj b/plugins/Weather/weather_14.vcxproj deleted file mode 100644 index 71bccd83b3..0000000000 --- a/plugins/Weather/weather_14.vcxproj +++ /dev/null @@ -1,224 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - Weather - {6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE} - - - - DynamicLibrary - Unicode - v140_xp - - - DynamicLibrary - true - Unicode - v140_xp - - - DynamicLibrary - Unicode - v140_xp - - - DynamicLibrary - true - Unicode - v140_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - true - - - - Full - OnlyExplicitInline - Size - true - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - false - true - Fast - Level3 - weather.h - Use - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - 0x72030000 - false - $(IntDir)$(TargetName).lib - true - Windows - $(ProfileDir)..\..\bin14\lib - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - false - true - Fast - weather.h - Level3 - Use - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - 0x72030000 - false - $(IntDir)$(TargetName).lib - true - Windows - $(ProfileDir)..\..\bin14\lib - - - - - Disabled - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - weather.h - Level3 - EditAndContinue - Use - true - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - 0x72030000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin14\lib - false - - - - - Disabled - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - weather.h - Level3 - Use - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - 0x72030000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin14\lib - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/Weather/weather_14.vcxproj.filters b/plugins/Weather/weather_14.vcxproj.filters deleted file mode 100644 index eb4d71d1eb..0000000000 --- a/plugins/Weather/weather_14.vcxproj.filters +++ /dev/null @@ -1,86 +0,0 @@ - - - - - {ae98b833-66fd-4d03-8883-da86b699da8e} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {229b056a-ba07-4698-ad86-26548bd87e32} - h;hpp;hxx;hm;inl - - - {4be16e1a-70ca-4330-b259-db32ec58dcc0} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file -- cgit v1.2.3